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

Commit a404d8ab authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Don't leak captive portal broadcast receivers." am: 873badbd am: c097e767 

am: 3a1c0ad3

Change-Id: Ic07daad92569f67e660daec8f6828f4c97b9b9f0
parents 397cde20 3a1c0ad3

packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java

+4 −5
Original line number Diff line number Diff line
@@ -542,10 +542,6 @@ public class NetworkMonitor extends StateMachine { 
                    return HANDLED;

                case CMD_NETWORK_DISCONNECTED:

                    logNetworkEvent(NetworkEvent.NETWORK_DISCONNECTED);

                    if (mLaunchCaptivePortalAppBroadcastReceiver != null) {

                        mContext.unregisterReceiver(mLaunchCaptivePortalAppBroadcastReceiver);

                        mLaunchCaptivePortalAppBroadcastReceiver = null;

                    }

                    quit();

                    return HANDLED;

                case CMD_FORCE_REEVALUATION:
@@ -779,7 +775,10 @@ public class NetworkMonitor extends StateMachine { 


        @Override

        public void exit() {

            if (mLaunchCaptivePortalAppBroadcastReceiver != null) {

                mContext.unregisterReceiver(mLaunchCaptivePortalAppBroadcastReceiver);

                mLaunchCaptivePortalAppBroadcastReceiver = null;

            }

            hideProvisioningNotification();

        }

    }