Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev

am: fa7453ed47

Change-Id: Ic8f99cb7c7fa7ed1f40c73342840f82c56f9f90f
This commit is contained in:
Paul Jensen
2016-06-14 11:16:15 +00:00
committed by android-build-merger

View File

@@ -3552,14 +3552,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
.build();
try {
notificationManager.notify(NOTIFICATION_ID, id, notification);
notificationManager.notifyAsUser(NOTIFICATION_ID, id, notification, UserHandle.ALL);
} catch (NullPointerException npe) {
loge("setNotificationVisible: visible notificationManager npe=" + npe);
npe.printStackTrace();
}
} else {
try {
notificationManager.cancel(NOTIFICATION_ID, id);
notificationManager.cancelAsUser(NOTIFICATION_ID, id, UserHandle.ALL);
} catch (NullPointerException npe) {
loge("setNotificationVisible: cancel notificationManager npe=" + npe);
npe.printStackTrace();