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

Commit 4c3a774e authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Transit to correct state after alarm is fired" am: f3c43205 

am: 510a2c5a

* commit '510a2c5a':
  Transit to correct state after alarm is fired
parents b013cfec 510a2c5a

services/core/java/com/android/server/DeviceIdleController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1649,6 +1649,7 @@ public class DeviceIdleController extends SystemService 
            // Whoops, there is an upcoming alarm.  We don't actually want to go idle.

            // Whoops, there is an upcoming alarm.  We don't actually want to go idle.

            if (mState != STATE_ACTIVE) {

            if (mState != STATE_ACTIVE) {

                becomeActiveLocked("alarm", Process.myUid());

                becomeActiveLocked("alarm", Process.myUid());

                becomeInactiveIfAppropriateLocked();

            }

            }

            return;

            return;

        }

        }