Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev

2015-11-12 23:08:48 +00:00
parent 6915d809e8 481a343d32
commit 516ac154e1
1 changed files with 2 additions and 2 deletions
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -215,11 +215,11 @@ public class UsageStatsService extends SystemService implements
            mPowerManager = getContext().getSystemService(PowerManager.class);

            mScreenOnSystemTimeSnapshot = System.currentTimeMillis();
-            synchronized (this) {
+            synchronized (mLock) {
                mScreenOnTime = readScreenOnTimeLocked();
            }
            mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);
-            synchronized (this) {
+            synchronized (mLock) {
                updateDisplayLocked();
            }
        } else if (phase == PHASE_BOOT_COMPLETED) {