Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev (7a6ff694) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/AirplaneModePreferenceController.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -35,11 +35,12 @@ import com.android.settings.AirplaneModeEnabler;
		import com.android.settings.R;
		import com.android.settings.core.TogglePreferenceController;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnDestroy;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		import com.android.settingslib.core.lifecycle.events.OnStop;

		public class AirplaneModePreferenceController extends TogglePreferenceController
		implements LifecycleObserver, OnStart, OnStop,
		implements LifecycleObserver, OnStart, OnStop, OnDestroy,
		AirplaneModeEnabler.OnAirplaneModeChangedListener {

		public static final int REQUEST_CODE_EXIT_ECM = 1;
		@@ -133,6 +134,12 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
		}
		}

		@Override
		public void onDestroy() {
		mAirplaneModeEnabler.close();
		}


		public void onActivityResult(int requestCode, int resultCode, Intent data) {
		if (requestCode == REQUEST_CODE_EXIT_ECM) {
		final boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);

+6 −0

Original line number	Diff line number	Diff line
		@@ -460,6 +460,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		super.onStop();
		}

		@Override
		public void onDestroy() {
		mAirplaneModeEnabler.close();
		super.onDestroy();
		}

		@Override
		public void onActivityResult(int requestCode, int resultCode, Intent data) {
		super.onActivityResult(requestCode, resultCode, data);