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

Commit d37638e5 authored by Yuhao Zheng's avatar Yuhao Zheng Committed by Android Git Automerger
Browse files

am 11a3bc70: am 709a4278: Merge "Don\'t mark wifi disabled unless it\'s off." into klp-dev 

* commit '11a3bc70':
  Don't mark wifi disabled unless it's off.
parents 1bb6a7dc 11a3bc70

wifi/java/android/net/wifi/WifiStateMachine.java

+4 −2
Original line number Diff line number Diff line
@@ -2957,8 +2957,10 @@ public class WifiStateMachine extends StateMachine { 


            if (mOperationalMode != CONNECT_MODE) {

                mWifiNative.disconnect();

                if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) {

                    mWifiConfigStore.disableAllNetworks();

                    setWifiState(WIFI_STATE_DISABLED);

                }

                transitionTo(mScanModeState);

            } else {

                /* Driver stop may have disabled networks, enable right after start */