Merge "Fix background PackageUsage writing."

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

@@ -611,7 +611,7 @@ public class PackageManagerService extends IPackageManager.Stub {
 
         void write(boolean force) {
             if (force) {
-                write();
+                writeInternal();
                 return;
             }
             if (SystemClock.elapsedRealtime() - mLastWritten.get() < WRITE_INTERVAL
@@ -623,7 +623,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                     @Override
                     public void run() {
                         try {
-                            write(true);
+                            writeInternal();
                         } finally {
                             mBackgroundWriteRunning.set(false);
                         }
@@ -632,7 +632,7 @@ public class PackageManagerService extends IPackageManager.Stub {
             }
         }
 
-        private void write() {
+        private void writeInternal() {
             synchronized (mPackages) {
                 synchronized (mFileLock) {
                     AtomicFile file = getFile();
@@ -4219,7 +4219,7 @@ public class PackageManagerService extends IPackageManager.Stub {
             if (updateUsage) {
                 p.mLastPackageUsageTimeInMills = System.currentTimeMillis();
             }
-            mPackageUsage.write();
+            mPackageUsage.write(false);
             if (!p.mDexOptNeeded) {
                 return false;
             }