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

Merge "Update SyncStorageEngine#DELETE_LEGACY_PARCEL_FILES." into rvc-dev am: a95769b719

Browse Source 
Change-Id: If79d4b99babfd3fb014fd2ac3035487b3b6df111
This commit is contained in:
Automerger Merge Worker
2020-03-06 19:32:37 +00:00
parent 760d0cad92 a95769b719
commit 8b23faa881
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/content/SyncStorageEngine.java
View File

@@ -472,8 +472,7 @@ public class SyncStorageEngine {
private int mSyncRandomOffset;
// STOPSHIP: b/143656271 this should be true on launch
private static final boolean DELETE_LEGACY_PARCEL_FILES = false;
private static final boolean DELETE_LEGACY_PARCEL_FILES = true;
private static final String LEGACY_STATUS_FILE_NAME = "status.bin";
private static final String LEGACY_STATISTICS_FILE_NAME = "stats.bin";
@@ -2076,7 +2075,7 @@ public class SyncStorageEngine {
}
// if upgrade to proto was successful, delete parcel file
if (DELETE_LEGACY_PARCEL_FILES && mStatusFile.exists()) {
if (DELETE_LEGACY_PARCEL_FILES && parcelStatus.exists() && mStatusFile.exists()) {
parcelStatus.delete();
}
}
@@ -2475,7 +2474,7 @@ public class SyncStorageEngine {
}
// if upgrade to proto was successful, delete parcel file
if (DELETE_LEGACY_PARCEL_FILES && mStatisticsFile.exists()) {
if (DELETE_LEGACY_PARCEL_FILES && parcelStats.exists() && mStatisticsFile.exists()) {
parcelStats.delete();
}
}