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

Commit e1f9064e authored by Irfan Sheriff's avatar Irfan Sheriff
Browse files

Fix network state handling 

Change I242cda97 introduced a regression where network state
was being modified on any supplicant state change.

Revert the old behavior of only changeing network detailed state
based on supplicant state change in a disconnected state

Bug: 4690073
Change-Id: I927cc5fa36b862cc54661b033939f543cd15d31f
parent c1f9486a

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