summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-13 00:31:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-13 00:31:34 +0000
commitb7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a (patch)
treec57ffca960befcd65568cb802e1acd5a412989f3
parente3e2c471b2504335e99ed15975c3c5c9dfbf2795 (diff)
parent112a72063846bb3bb18963c861acbe1efd8bd754 (diff)
downloadbase-b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a.tar.gz
Merge "Fix background PackageUsage writing."
-rwxr-xr-xservices/java/com/android/server/pm/PackageManagerService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 51c450bc0286..066290cdf730 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/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;
}