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

Commit 84a1b9e1 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Fix network state handling"

parents 4d4faf9e e1f9064e

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

+6 −2
Original line number Diff line number Diff line
@@ -1438,7 +1438,6 @@ public class WifiStateMachine extends StateMachine { 
            /* BSSID is valid only in ASSOCIATING state */

            mWifiInfo.setBSSID(stateChangeResult.BSSID);

        }

        setNetworkDetailedState(WifiInfo.getDetailedStateOf(state));



        mSupplicantStateTracker.sendMessage(Message.obtain(message));

        mWpsStateMachine.sendMessage(Message.obtain(message));
@@ -2975,6 +2974,11 @@ public class WifiStateMachine extends StateMachine { 
                    /* Ignore network disconnect */

                case NETWORK_DISCONNECTION_EVENT:

                    break;

                case SUPPLICANT_STATE_CHANGE_EVENT:

                    StateChangeResult stateChangeResult = (StateChangeResult) message.obj;

                    setNetworkDetailedState(WifiInfo.getDetailedStateOf(stateChangeResult.state));

                    /* ConnectModeState does the rest of the handling */

                    return NOT_HANDLED;

                case CMD_START_SCAN:

                    /* Disable background scan temporarily during a regular scan */

                    if (mEnableBackgroundScan) {