am 2ce02bba: am b7d7cbc9: Merge "Fix background PackageUsage writing." (f230061b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -612,7 +612,7 @@ public class PackageManagerService extends IPackageManager.Stub {

		void write(boolean force) {
		if (force) {
		write();
		writeInternal();
		return;
		}
		if (SystemClock.elapsedRealtime() - mLastWritten.get() < WRITE_INTERVAL
		@@ -624,7 +624,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		@Override
		public void run() {
		try {
		write(true);
		writeInternal();
		} finally {
		mBackgroundWriteRunning.set(false);
		}
		@@ -633,7 +633,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		}

		private void write() {
		private void writeInternal() {
		synchronized (mPackages) {
		synchronized (mFileLock) {
		AtomicFile file = getFile();
		@@ -4251,7 +4251,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		if (updateUsage) {
		p.mLastPackageUsageTimeInMills = System.currentTimeMillis();
		}
		mPackageUsage.write();
		mPackageUsage.write(false);
		if (!p.mDexOptNeeded) {
		return false;
		}