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

Commit af333486 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0 

* commit '11116b80':
  Disconnect without CTRL-EVENT-DISCONNECTED
parents 46c8f153 11116b80

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

+13 −0
Original line number Original line Diff line number Diff line
@@ -2698,6 +2698,19 @@ public class WifiStateMachine extends StateMachine { 
                            handleNetworkDisconnect();

                            handleNetworkDisconnect();

                        }

                        }

                        transitionTo(mDriverStoppedState);

                        transitionTo(mDriverStoppedState);

                        break;

                    }



                    // Supplicant can fail to report a NETWORK_DISCONNECTION_EVENT

                    // when authentication times out after a successful connection,

                    // we can figure this from the supplicant state. If supplicant

                    // state is DISCONNECTED, but the mNetworkInfo says we are not

                    // disconnected, we need to handle a disconnection

                    if (state == SupplicantState.DISCONNECTED &&

                            mNetworkInfo.getState() != NetworkInfo.State.DISCONNECTED) {

                        if (DBG) log("Missed CTRL-EVENT-DISCONNECTED, disconnect");

                        handleNetworkDisconnect();

                        transitionTo(mDisconnectedState);

                    }

                    }

                    break;

                    break;

                    /* Do a redundant disconnect without transition */

                    /* Do a redundant disconnect without transition */