Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
  Ignore outstanding delayed shutdown on restart
This commit is contained in:
Robert Greenwalt
2013-05-28 21:23:11 -07:00
committed by Android Git Automerger
parent e3425ac426 aa4b2ee0d6
commit 466ceb463f
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@@ -2357,6 +2357,7 @@ public class WifiStateMachine extends StateMachine {
public void enter() { public void enter() {
mIsRunning = true; mIsRunning = true;
mInDelayedStop = false; mInDelayedStop = false;
mDelayedStopCounter++;
updateBatteryWorkSource(null); updateBatteryWorkSource(null);
/** /**