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

Commit 510a2c5a 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

* commit 'f3c43205':
  Transit to correct state after alarm is fired
parents 0218fc7d f3c43205

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

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

            if (mState != STATE_ACTIVE) {

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

                becomeInactiveIfAppropriateLocked();

            }

            return;

        }