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

Commit e3537438 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Don't leak captive portal broadcast receivers. 

Since aosp/937885, mLaunchCaptivePortalAppBroadcastReceiver is
nulled out, but not unregistered, when exiting MaybeNotifyState.
This causes the BroadcastReceiver to be leaked because it is no
longer unregistered when processing CMD_NETWORK_DISCONNECTED.

Fix this by unregistering the receiver in MaybeNotifyState#exit.
Also remove the unregister call in CMD_NETWORK_DISCONNECTED: it
is no longer necessary, because StateMachine, before quitting,
will call the exit method of the current state and all its
parent states.

Bug: 122164725
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I447b3cfd3821dda19482ed962dd59ec61fc5fc9b
parent 43b75cad

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

        }

    }