commit 481a343d32835612300c9f9e73b0fa7ccfb9831b
author Amith Yamasani <yamasani@google.com> Wed Nov 11 12:46:02 2015 -0800
committer Joe LaPenna <jlapenna@google.com> Wed Nov 11 17:39:37 2015 -0800
tree b866d83dd719c11b57aa5d5617b8bd425ef30ab7
parent 7018f60b06fd0c647ebf13225320d7e15d02e075

DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files

Bug: 25355086
Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3
(Cherrypicked from ccf7d9e8ce11fd44e5b70b375ce25bed93e7153c)

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 54d9cd9..84c0443 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -215,11 +215,11 @@
             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) {