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

Commit 1a05cb2b authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android Git Automerger
Browse files

am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot... 

am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '5f683ca8':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
parents 5becf411 5f683ca8

services/java/com/android/server/wifi/WifiController.java

+11 −1
Original line number Diff line number Diff line
@@ -152,11 +152,21 @@ class WifiController extends StateMachine { 
            addState(mStaDisabledWithScanState, mDefaultState);

            addState(mApEnabledState, mDefaultState);

            addState(mEcmState, mDefaultState);

        if (mSettingsStore.isScanAlwaysAvailable()) {



        boolean isAirplaneModeOn = mSettingsStore.isAirplaneModeOn();

        boolean isWifiEnabled = mSettingsStore.isWifiToggleEnabled();

        boolean isScanningAlwaysAvailable = mSettingsStore.isScanAlwaysAvailable();



        log("isAirplaneModeOn = " + isAirplaneModeOn +

                ", isWifiEnabled = " + isWifiEnabled +

                ", isScanningAvailable = " + isScanningAlwaysAvailable);



        if (isWifiEnabled && isScanningAlwaysAvailable) {

            setInitialState(mStaDisabledWithScanState);

        } else {

            setInitialState(mApStaDisabledState);

        }



        setLogRecSize(100);

        setLogOnlyTransitions(false);