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

2013-05-29 04:21:24 +00:00
parent af1e512e3f e9868c1ba0
commit aa4b2ee0d6
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
@@ -2355,6 +2355,7 @@ public class WifiStateMachine extends StateMachine {
        public void enter() {
            mIsRunning = true;
            mInDelayedStop = false;
+            mDelayedStopCounter++;
            updateBatteryWorkSource(null);

            /**