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

Commit 8c59edaa 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: 9bb3fd99

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

Change-Id: I2198b0c121a8d79abd25634df439195ef3bd61d9
parents 4b8e76a6 9bb3fd99

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