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

Merge "Update UsageStatsSerivce#KEEP_LEGACY_DIR." into rvc-dev am: 35afbf3271 am: 4aab912778 am: 4b6867f66c

Browse Source 
Change-Id: I4d280d9db429158b19cdaeb4d1db85e37037c664
This commit is contained in:
Automerger Merge Worker
2020-03-14 02:11:41 +00:00
parent 5583cc8ffc 4b6867f66c
commit 19d17eae74
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/usage/java/com/android/server/usage/UsageStatsService.java
View File

@@ -137,8 +137,7 @@ public class UsageStatsService extends SystemService implements
private static final File USAGE_STATS_LEGACY_DIR = new File(
Environment.getDataSystemDirectory(), "usagestats");
// For migration purposes, indicates whether to keep the legacy usage stats directory or not
// STOPSHIP: b/138323140 this should be false on launch
private static final boolean KEEP_LEGACY_DIR = true;
private static final boolean KEEP_LEGACY_DIR = false;
private static final char TOKEN_DELIMITER = '/';
@@ -648,7 +647,7 @@ public class UsageStatsService extends SystemService implements
private void deleteLegacyDir(int userId) {
final File legacyUserDir = new File(USAGE_STATS_LEGACY_DIR, Integer.toString(userId));
if (!KEEP_LEGACY_DIR) {
if (!KEEP_LEGACY_DIR && legacyUserDir.exists()) {
deleteRecursively(legacyUserDir);
if (legacyUserDir.exists()) {
Slog.w(TAG, "Error occurred while attempting to delete legacy usage stats "