commit bdb94fe2ce45325f2f569f76a85f8183d0fc7488
author Amith Yamasani <yamasani@google.com> Wed Nov 11 20:45:29 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 11 20:45:29 2015 +0000
tree 20d668e854334924a9388d63f8dadabf42e10bab
parent 0fecb5b008c06273fac5b9b6f425476271283b99
parent f12ffe6d762f281cbda56322be83a1da80b707ea

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

* commit 'f12ffe6d762f281cbda56322be83a1da80b707ea':
  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 013154b..f078a35 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();
             }