Merge "Transit to correct state after alarm is fired"

2016-02-04 21:52:54 +00:00
parent 026a58476b 27b33306e6
commit f3c432059c
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -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;
        }