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

This commit is contained in:
Robert Greenwalt
2013-05-29 04:21:24 +00:00
committed by Android (Google) Code Review

View File

@@ -2355,6 +2355,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);
/** /**