diff options
| author | 2013-05-28 21:23:11 -0700 | |
|---|---|---|
| committer | 2013-05-28 21:23:11 -0700 | |
| commit | 466ceb463f44f72bdd73764e50dcb34c174a0cfe (patch) | |
| tree | 68e2f890b41eaba3518df6f93a3bf7ffa00a1b44 | |
| parent | e3425ac426fa5da15fa3d8471dd9c0e27cb52375 (diff) | |
| parent | aa4b2ee0d654b345b727cb47afd246d0b769fafd (diff) | |
am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
Ignore outstanding delayed shutdown on restart
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index f0b16699dd7a..f3eca7c4a5ee 100644 --- 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); /** |