Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev (1339a632) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();