Merge "Don't leak NetworkListens in captive portal app." into mnc-dev (8845f839) · Commits · e / os / android_frameworks_base

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -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() {