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

Merge "Update UsageStatsDatabase#KEEP_BACKUP_DIR." into rvc-dev am: cd2b3babc7 am: ac0dd9d345

Browse Source 
Change-Id: I283611a0f34673f9c934df1089d29a31d862f21e
This commit is contained in:
Automerger Merge Worker
2020-03-14 01:54:51 +00:00
parent eae09ccbb3 ac0dd9d345
commit 9aa9c580c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/usage/java/com/android/server/usage/UsageStatsDatabase.java
View File

@@ -98,8 +98,7 @@ public class UsageStatsDatabase {
// Persist versioned backup files. // Persist versioned backup files.
// Should be false, except when testing new versions // Should be false, except when testing new versions
// STOPSHIP: b/139937606 this should be false on launch static final boolean KEEP_BACKUP_DIR = false;
static final boolean KEEP_BACKUP_DIR = true;
private static final String TAG = "UsageStatsDatabase"; private static final String TAG = "UsageStatsDatabase";
private static final boolean DEBUG = UsageStatsService.DEBUG; private static final boolean DEBUG = UsageStatsService.DEBUG;
@@ -412,6 +411,7 @@ public class UsageStatsDatabase {
} }
if (mBackupsDir.exists() && !KEEP_BACKUP_DIR) { if (mBackupsDir.exists() && !KEEP_BACKUP_DIR) {
mUpgradePerformed = true; // updated here to ensure that data is cleaned up
deleteDirectory(mBackupsDir); deleteDirectory(mBackupsDir);
} }
} }