Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 466ceb46 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

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

* commit 'aa4b2ee0':
  Ignore outstanding delayed shutdown on restart
parents e3425ac4 aa4b2ee0

wifi/java/android/net/wifi/WifiStateMachine.java

+1 −0
Original line number Diff line number Diff line
@@ -2357,6 +2357,7 @@ public class WifiStateMachine extends StateMachine { 
        public void enter() {

            mIsRunning = true;

            mInDelayedStop = false;

            mDelayedStopCounter++;

            updateBatteryWorkSource(null);



            /**