commit 6d9b0fb923bc6d77b23ac40841625d61eb003e0f
author Bart Sears <bsears@google.com> Mon Feb 01 22:27:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 01 22:27:37 2016 +0000
tree c9a73e47e22a0ada892fe9688b613175bf85a2ce
parent 8cc5899aef3ab8e1ad35d6882a082416aea734ed
parent 795e53a36b0bda3555e23ea8b54cf97361014a24

Merge "Hack to get devices booting again." into mnc-dr1.5-dev am: 29700949ad
am: 795e53a36b

* commit '795e53a36b0bda3555e23ea8b54cf97361014a24':
  Hack to get devices booting again.

services/usage/java/com/android/server/usage/UsageStatsService.java

diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index 6dc6d18..b275c2f 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -145,6 +145,8 @@
     private boolean mScreenOn;
     private long mLastAppIdleParoledTime;
 
+    private volatile boolean mPendingOneTimeCheckIdleStates;
+
     long mScreenOnTime;
     long mLastScreenOnEventRealtime;
 
@@ -221,6 +223,10 @@
             synchronized (this) {
                 updateDisplayLocked();
             }
+
+            if (mPendingOneTimeCheckIdleStates) {
+                postOneTimeCheckIdleStates();
+            }
         } else if (phase == PHASE_BOOT_COMPLETED) {
             setAppIdleParoled(getContext().getSystemService(BatteryManager.class).isCharging());
         }
@@ -368,7 +374,13 @@
      * scheduling a series of repeating checkIdleStates each time we fired off one.
      */
     void postOneTimeCheckIdleStates() {
-        mHandler.sendEmptyMessage(MSG_ONE_TIME_CHECK_IDLE_STATES);
+        if (mDeviceIdleController == null) {
+            // Not booted yet; wait for it!
+            mPendingOneTimeCheckIdleStates = true;
+        } else {
+            mHandler.sendEmptyMessage(MSG_ONE_TIME_CHECK_IDLE_STATES);
+            mPendingOneTimeCheckIdleStates = false;
+        }
     }
 
     /** Check all running users' or specified user's apps to see if they enter an idle state. */