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

Commit 6ea2faf8 authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android Git Automerger
Browse files

am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev 

* commit '64036633':
  Revert "Temporarily disable 'Scan Always' mode"
parents e48269f8 64036633

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

+0 −6
Original line number Diff line number Diff line
@@ -379,9 +379,6 @@ class WifiController extends StateMachine { 


        @Override

        public void enter() {



            if (DBG) logd("Going to disabled without scan state");



            mWifiStateMachine.setSupplicantRunning(false);

            // Supplicant can't restart right away, so not the time we switched off

            mDisabledTimestamp = SystemClock.elapsedRealtime();
@@ -499,9 +496,6 @@ class WifiController extends StateMachine { 


        @Override

        public void enter() {



            if (DBG) logd("Enabling disabled with scan state");



            mWifiStateMachine.setSupplicantRunning(true);

            mWifiStateMachine.setOperationalMode(WifiStateMachine.SCAN_ONLY_WITH_WIFI_OFF_MODE);

            mWifiStateMachine.setDriverStart(true);

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

+2 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ final class WifiSettingsStore { 
        mContext = context;

        mAirplaneModeOn = getPersistedAirplaneModeOn();

        mPersistWifiState = getPersistedWifiState();

        mScanAlwaysAvailable = false; // getPersistedScanAlwaysAvailable();

        mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();

    }



    synchronized boolean isWifiToggleEnabled() {
@@ -124,8 +124,7 @@ final class WifiSettingsStore { 
    }



    synchronized void handleWifiScanAlwaysAvailableToggled() {

        // mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();

        mScanAlwaysAvailable = false;

        mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();

    }



    void dump(FileDescriptor fd, PrintWriter pw, String[] args) {