Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev (e30735c7) · Commits · e / os / android_frameworks_base

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -1898,6 +1898,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		break;
		}
		case NetworkMonitor.EVENT_PROVISIONING_NOTIFICATION: {
		if (msg.arg1 == 0) {
		setProvNotificationVisibleIntent(false, msg.arg2, 0, null, null);
		} else {
		NetworkAgentInfo nai = null;
		synchronized (mNetworkForNetId) {
		nai = mNetworkForNetId.get(msg.arg2);
		@@ -1906,9 +1909,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		loge("EVENT_PROVISIONING_NOTIFICATION from unknown NetworkMonitor");
		break;
		}
		if (msg.arg1 == 0) {
		setProvNotificationVisibleIntent(false, msg.arg2, 0, null, null);
		} else {
		setProvNotificationVisibleIntent(true, msg.arg2, nai.networkInfo.getType(),
		nai.networkInfo.getExtraInfo(), (PendingIntent)msg.obj);
		}