am 466ceb46: am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev

* commit '466ceb463f44f72bdd73764e50dcb34c174a0cfe': Ignore outstanding delayed shutdown on restart
2013-05-28 21:25:44 -07:00
parent 09d85677c3 466ceb463f
commit b61e757ffb
1 changed files with 1 additions and 0 deletions
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2357,6 +2357,7 @@ public class WifiStateMachine extends StateMachine {
        public void enter() {
            mIsRunning = true;
            mInDelayedStop = false;
+            mDelayedStopCounter++;
            updateBatteryWorkSource(null);

            /**