Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address post-commit review comments"

Browse Source 
am: 858634e4ec

Change-Id: Ia530cc2cdf583baae825386a52fdb8eb3763d99b
This commit is contained in:
Neil Fuller
2017-07-17 22:32:37 +00:00
committed by android-build-merger
parent 08cff4c76b 858634e4ec
commit 5c15f6d6b1
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/timezone/PackageStatusStorage.java
View File

@@ -16,6 +16,7 @@
package com.android.server.timezone; package com.android.server.timezone;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.FastXmlSerializer;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
@@ -80,7 +81,7 @@ final class PackageStatusStorage {
private final AtomicFile mPackageStatusFile; private final AtomicFile mPackageStatusFile;
PackageStatusStorage(File storageDir) { PackageStatusStorage(File storageDir) {
mPackageStatusFile = new AtomicFile(new File(storageDir, "packageStatus.xml")); mPackageStatusFile = new AtomicFile(new File(storageDir, "package-status.xml"));
if (!mPackageStatusFile.getBaseFile().exists()) { if (!mPackageStatusFile.getBaseFile().exists()) {
try { try {
insertInitialPackageStatus(); insertInitialPackageStatus();
@@ -103,7 +104,7 @@ final class PackageStatusStorage {
PackageStatus getPackageStatus() { PackageStatus getPackageStatus() {
synchronized (this) { synchronized (this) {
try { try {
return getPackageStatusInternal(); return getPackageStatusLocked();
} catch (ParseException e) { } catch (ParseException e) {
// This means that data exists in the file but it was bad. // This means that data exists in the file but it was bad.
Slog.e(LOG_TAG, "Package status invalid, resetting and retrying", e); Slog.e(LOG_TAG, "Package status invalid, resetting and retrying", e);
@@ -111,7 +112,7 @@ final class PackageStatusStorage {
// Reset the storage so it is in a good state again. // Reset the storage so it is in a good state again.
recoverFromBadData(e); recoverFromBadData(e);
try { try {
return getPackageStatusInternal(); return getPackageStatusLocked();
} catch (ParseException e2) { } catch (ParseException e2) {
throw new IllegalStateException("Recovery from bad file failed", e2); throw new IllegalStateException("Recovery from bad file failed", e2);
} }
@@ -119,7 +120,8 @@ final class PackageStatusStorage {
} }
} }
private PackageStatus getPackageStatusInternal() throws ParseException { @GuardedBy("this")
private PackageStatus getPackageStatusLocked() throws ParseException {
try (FileInputStream fis = mPackageStatusFile.openRead()) { try (FileInputStream fis = mPackageStatusFile.openRead()) {
XmlPullParser parser = parseToPackageStatusTag(fis); XmlPullParser parser = parseToPackageStatusTag(fis);
Integer checkStatus = getNullableIntAttribute(parser, ATTRIBUTE_CHECK_STATUS); Integer checkStatus = getNullableIntAttribute(parser, ATTRIBUTE_CHECK_STATUS);
@@ -137,7 +139,7 @@ final class PackageStatusStorage {
} }
} }
// Callers should be synchronized(this). @GuardedBy("this")
private int recoverFromBadData(Exception cause) { private int recoverFromBadData(Exception cause) {
mPackageStatusFile.delete(); mPackageStatusFile.delete();
try { try {
@@ -155,7 +157,7 @@ final class PackageStatusStorage {
// is reset to ensure that old tokens are unlikely to work. // is reset to ensure that old tokens are unlikely to work.
final int initialOptimisticLockId = (int) System.currentTimeMillis(); final int initialOptimisticLockId = (int) System.currentTimeMillis();
writePackageStatusInternal(null /* status */, initialOptimisticLockId, writePackageStatusLocked(null /* status */, initialOptimisticLockId,
null /* packageVersions */); null /* packageVersions */);
return initialOptimisticLockId; return initialOptimisticLockId;
} }
@@ -243,7 +245,7 @@ final class PackageStatusStorage {
} }
} }
// Caller should be synchronized(this). @GuardedBy("this")
private int getCurrentOptimisticLockId() throws ParseException { private int getCurrentOptimisticLockId() throws ParseException {
try (FileInputStream fis = mPackageStatusFile.openRead()) { try (FileInputStream fis = mPackageStatusFile.openRead()) {
XmlPullParser parser = parseToPackageStatusTag(fis); XmlPullParser parser = parseToPackageStatusTag(fis);
@@ -278,7 +280,7 @@ final class PackageStatusStorage {
} }
} }
// Caller should be synchronized(this). @GuardedBy("this")
private boolean writePackageStatusWithOptimisticLockCheck(int optimisticLockId, private boolean writePackageStatusWithOptimisticLockCheck(int optimisticLockId,
int newOptimisticLockId, Integer status, PackageVersions packageVersions) int newOptimisticLockId, Integer status, PackageVersions packageVersions)
throws IOException { throws IOException {
@@ -294,12 +296,12 @@ final class PackageStatusStorage {
return false; return false;
} }
writePackageStatusInternal(status, newOptimisticLockId, packageVersions); writePackageStatusLocked(status, newOptimisticLockId, packageVersions);
return true; return true;
} }
// Caller should be synchronized(this). @GuardedBy("this")
private void writePackageStatusInternal(Integer status, int optimisticLockId, private void writePackageStatusLocked(Integer status, int optimisticLockId,
PackageVersions packageVersions) throws IOException { PackageVersions packageVersions) throws IOException {
if ((status == null) != (packageVersions == null)) { if ((status == null) != (packageVersions == null)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(