Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b866e020 authored by Jeremy Goldman's avatar Jeremy Goldman Committed by Automerger Merge Worker
Browse files

Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into... 

Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev am: 7a6ff694 am: 1d283112

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

Change-Id: I20bb0ddcd89b746c6678928221a0d8b738154139
parents 8095f5f4 1d283112

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);

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

+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);