Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev (516ac154) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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) {