diff options
| author | Varun Shah <varunshah@google.com> | 2019-12-20 11:12:03 -0800 |
|---|---|---|
| committer | Varun Shah <varunshah@google.com> | 2020-03-13 21:51:07 +0000 |
| commit | 11b34ce0c757ee30842f180a1cc88d349fa4d77c (patch) | |
| tree | f38e43dd5c9f3a6c08f25fc2ff9bfb0d03edbc61 | |
| parent | 6d03d973c02feff88019b246e6506f2b072fc535 (diff) | |
Update UsageStatsDatabase#KEEP_BACKUP_DIR.
Delete the backup usage stats directory on a successful upgrade to v5.
This was kept as true such that a revert to the previous version would
be possible if needed.
Also indicate that an upgrade was performed such that relevant data is
pruned on dogfood builds.
Bug: 139937606
Test: manual: dir is deleted on migration.
Change-Id: I60285dc812a045bc82dd68a6e7ae87c2d3563adc
| -rw-r--r-- | services/usage/java/com/android/server/usage/UsageStatsDatabase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java index ef9a73b794f7..9d48955c87be 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java +++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java @@ -98,8 +98,7 @@ public class UsageStatsDatabase { // Persist versioned backup files. // Should be false, except when testing new versions - // STOPSHIP: b/139937606 this should be false on launch - static final boolean KEEP_BACKUP_DIR = true; + static final boolean KEEP_BACKUP_DIR = false; private static final String TAG = "UsageStatsDatabase"; private static final boolean DEBUG = UsageStatsService.DEBUG; @@ -412,6 +411,7 @@ public class UsageStatsDatabase { } if (mBackupsDir.exists() && !KEEP_BACKUP_DIR) { + mUpgradePerformed = true; // updated here to ensure that data is cleaned up deleteDirectory(mBackupsDir); } } |