Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b07c6e authored by Paul Jensen's avatar Paul Jensen Committed by Android Git Automerger
Browse files

am 9a0a9fda: Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 

* commit '9a0a9fda4024f0ac9611780b0af161c65d48b6a3':
  Fix to allow removing sign-in notification when network removed.
parents 71785ed7 e30735c7

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);

                    }