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

Commit aa4b2ee0 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

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

parents af1e512e e9868c1b

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

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

            mIsRunning = true;

            mInDelayedStop = false;

            mDelayedStopCounter++;

            updateBatteryWorkSource(null);



            /**