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

am: 3ed407344a

Change-Id: I82726a61541da890dea12448b2823f3dd7e367d2
This commit is contained in:
Paul Jensen
2016-06-14 11:21:12 +00:00
committed by android-build-merger

View File

@@ -3566,14 +3566,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();