Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't leak captive portal broadcast receivers."

Browse Source
This commit is contained in:
Lorenzo Colitti
2019-04-09 02:45:42 +00:00
committed by Gerrit Code Review
parent 130b5bf146 e35374386b
commit 873badbd1c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -542,10 +542,6 @@ public class NetworkMonitor extends StateMachine {
return HANDLED; return HANDLED;
case CMD_NETWORK_DISCONNECTED: case CMD_NETWORK_DISCONNECTED:
logNetworkEvent(NetworkEvent.NETWORK_DISCONNECTED); logNetworkEvent(NetworkEvent.NETWORK_DISCONNECTED);
if (mLaunchCaptivePortalAppBroadcastReceiver != null) {
mContext.unregisterReceiver(mLaunchCaptivePortalAppBroadcastReceiver);
mLaunchCaptivePortalAppBroadcastReceiver = null;
}
quit(); quit();
return HANDLED; return HANDLED;
case CMD_FORCE_REEVALUATION: case CMD_FORCE_REEVALUATION:
@@ -779,7 +775,10 @@ public class NetworkMonitor extends StateMachine {
@Override @Override
public void exit() { public void exit() {
if (mLaunchCaptivePortalAppBroadcastReceiver != null) {
mContext.unregisterReceiver(mLaunchCaptivePortalAppBroadcastReceiver);
mLaunchCaptivePortalAppBroadcastReceiver = null; mLaunchCaptivePortalAppBroadcastReceiver = null;
}
hideProvisioningNotification(); hideProvisioningNotification();
} }
} }