diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-05-18 12:48:28 -0400 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2015-05-18 12:48:28 -0400 |
| commit | 868f6243bc6021465938a7b764bef8fd001cb39c (patch) | |
| tree | 553f1e725d60f2d11512cfcfa6d630b28c83c8f3 /packages/CaptivePortalLogin | |
| parent | 99f6977d3cbde054307cc1001cdc50f67399e4ca (diff) | |
| download | frameworks_base-868f6243bc6021465938a7b764bef8fd001cb39c.zip frameworks_base-868f6243bc6021465938a7b764bef8fd001cb39c.tar.gz frameworks_base-868f6243bc6021465938a7b764bef8fd001cb39c.tar.bz2 | |
Don't leak NetworkListens in captive portal app.
Bug:21146632
Change-Id: I934044a2eec89a47185add881a74de5669cd0f89
Diffstat (limited to 'packages/CaptivePortalLogin')
| -rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index 1019e6c..c7b7e6a 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -146,6 +146,7 @@ public class CaptivePortalLoginActivity extends Activity { private void done(Result result) { if (mNetworkCallback != null) { mCm.unregisterNetworkCallback(mNetworkCallback); + mNetworkCallback = null; } switch (result) { case DISMISSED: @@ -191,6 +192,16 @@ public class CaptivePortalLoginActivity extends Activity { return super.onOptionsItemSelected(item); } + @Override + public void onDestroy() { + super.onDestroy(); + + if (mNetworkCallback != null) { + mCm.unregisterNetworkCallback(mNetworkCallback); + mNetworkCallback = null; + } + } + private void testForCaptivePortal() { new Thread(new Runnable() { public void run() { |