am b7d7cbc9: Merge "Fix background PackageUsage writing."

* commit 'b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a':
  Fix background PackageUsage writing.
This commit is contained in:
Brian Carlstrom
2014-05-13 00:34:42 +00:00
committed by Android Git Automerger

View File

@@ -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;
}