Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
aa4b2ee0d6
@@ -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);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user