commit 2ce02bba1eea682282408b8521dad8c91837fbab
author Brian Carlstrom <bdc@google.com> Tue May 13 00:34:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 00:34:42 2014 +0000
tree 2a6daec1fdc98afe3b454615d7190695a686791b
parent f521ee6fa9645bb944cf1f452cc40f4d8d580b4e
parent b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a

am b7d7cbc9: Merge "Fix background PackageUsage writing."

* commit 'b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a':
  Fix background PackageUsage writing.

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

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index b414243..6f9e6be 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -611,7 +611,7 @@
 
         void write(boolean force) {
             if (force) {
-                write();
+                writeInternal();
                 return;
             }
             if (SystemClock.elapsedRealtime() - mLastWritten.get() < WRITE_INTERVAL
@@ -623,7 +623,7 @@
                     @Override
                     public void run() {
                         try {
-                            write(true);
+                            writeInternal();
                         } finally {
                             mBackgroundWriteRunning.set(false);
                         }
@@ -632,7 +632,7 @@
             }
         }
 
-        private void write() {
+        private void writeInternal() {
             synchronized (mPackages) {
                 synchronized (mFileLock) {
                     AtomicFile file = getFile();
@@ -4219,7 +4219,7 @@
             if (updateUsage) {
                 p.mLastPackageUsageTimeInMills = System.currentTimeMillis();
             }
-            mPackageUsage.write();
+            mPackageUsage.write(false);
             if (!p.mDexOptNeeded) {
                 return false;
             }