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

Commit bdb94fe2 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

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

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

* commit 'f12ffe6d':
  Fix system watchdog timeout when reading too many usage events.
parents 0fecb5b0 f12ffe6d

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

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ public class UsageStatsService extends SystemService implements 
            synchronized (this) {

                mScreenOnTime = readScreenOnTimeLocked();

            }

            mDisplayManager.registerDisplayListener(mDisplayListener, null);

            mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);

            synchronized (this) {

                updateDisplayLocked();

            }