commit b3d48f18a94c586823462c93fc0f739c83f3db78
author Amith Yamasani <yamasani@google.com> Wed Nov 11 20:30:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 11 20:30:32 2015 +0000
tree f7ab604230933e318c51d20413b2a80878ba8223
parent 467804448d6b13e04b4d9bc20fd195baa1f07e90
parent 10b0bae06ffdeb79494ddd1aff19387b56770960

Merge "Fix system watchdog timeout when reading too many usage events."
am: 10b0bae06f

* commit '10b0bae06ffdeb79494ddd1aff19387b56770960':
  Fix system watchdog timeout when reading too many usage events.

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 5ad796f..d47d551 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -218,7 +218,7 @@
             synchronized (this) {
                 mScreenOnTime = readScreenOnTimeLocked();
             }
-            mDisplayManager.registerDisplayListener(mDisplayListener, null);
+            mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);
             synchronized (this) {
                 updateDisplayLocked();
             }