From ccf7d9e8ce11fd44e5b70b375ce25bed93e7153c Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 11 Nov 2015 12:46:02 -0800
Subject: [PATCH] Use correct lock for reading/writing usage stats files

Bug: 25355086
Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3
---
 .../java/com/android/server/usage/UsageStatsService.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index f078a35006ecb..2b0919b7bfc05 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 @@ 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) {