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

Commit 892b52f1 authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android Git Automerger
Browse files

am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev 

* commit '9f250e28':
  Temporarily disable 'Scan Always' mode
parents 9544df07 9f250e28

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

+6 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ 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();
@@ -496,6 +499,9 @@ 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

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

        mAirplaneModeOn = getPersistedAirplaneModeOn();

        mPersistWifiState = getPersistedWifiState();

        mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();

        mScanAlwaysAvailable = false; // getPersistedScanAlwaysAvailable();

    }



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



    synchronized void handleWifiScanAlwaysAvailableToggled() {

        mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();

        // mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();

        mScanAlwaysAvailable = false;

    }



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