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

* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd': Ignore outstanding delayed shutdown on restart
2013-05-28 21:23:11 -07:00
parent e3425ac426 aa4b2ee0d6
commit 466ceb463f
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);

            /**