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

Commit b06cc749 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev 

* commit 'e203384f':
  Disconnect from AP when teardown requested.
parents 82b6de03 e203384f

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

+6 −0
Original line number Diff line number Diff line
@@ -2442,6 +2442,9 @@ public class WifiStateMachine extends StateMachine { 
                        if (DBG) log("Already in delayed stop");

                        break;

                    }

                    /* disconnect right now, but leave the driver running for a bit */

                    mWifiConfigStore.disableAllNetworks();



                    mInDelayedStop = true;

                    mDelayedStopCounter++;

                    if (DBG) log("Delayed stop message " + mDelayedStopCounter);
@@ -2462,6 +2465,9 @@ public class WifiStateMachine extends StateMachine { 
                        mDelayedStopCounter++;

                        mAlarmManager.cancel(mDriverStopIntent);

                        if (DBG) log("Delayed stop ignored due to start");

                        if (mOperationalMode == CONNECT_MODE) {

                            mWifiConfigStore.enableAllNetworks();

                        }

                    }

                    break;

                case CMD_DELAYED_STOP_DRIVER: