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

Commit fa62202e authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by The Android Automerger
Browse files

Temporarily disable 'Scan Always' mode 

This change disables 'Scan Always' by ignoring the setting; and
hard coding value to 'false'. The UI will change based on whatever
is in settings; but underneath we won't enable scans when WiFi is
off.

Change-Id: Ibb1401207b6675e609e979ea23b63177814f762c
parent d971caa5

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