Merge "Update UsageStatsDatabase#KEEP_BACKUP_DIR." into rvc-dev am: cd2b3babc7... (79f3e791) · Commits · e / os / android_frameworks_base

services/usage/java/com/android/server/usage/UsageStatsDatabase.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}