PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev am: 7a6ff6942c am: 9bb3fd99d5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007770

Change-Id: I2198b0c121a8d79abd25634df439195ef3bd61d9
This commit is contained in:
Jeremy Goldman
2021-06-24 01:08:12 +00:00
committed by Automerger Merge Worker
parent 4b8e76a6e6 9bb3fd99d5
commit 8c59edaa01
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -35,11 +35,12 @@ import com.android.settings.AirplaneModeEnabler;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver; 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.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.core.lifecycle.events.OnStop;
public class AirplaneModePreferenceController extends TogglePreferenceController public class AirplaneModePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnStart, OnStop, implements LifecycleObserver, OnStart, OnStop, OnDestroy,
AirplaneModeEnabler.OnAirplaneModeChangedListener { AirplaneModeEnabler.OnAirplaneModeChangedListener {
public static final int REQUEST_CODE_EXIT_ECM = 1; 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) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_EXIT_ECM) { if (requestCode == REQUEST_CODE_EXIT_ECM) {
final boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false); final boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);

6
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -460,6 +460,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
super.onStop(); super.onStop();
} }
@Override
public void onDestroy() {
mAirplaneModeEnabler.close();
super.onDestroy();
}
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);