Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eab0f18 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update UsageStatsDatabase#KEEP_BACKUP_DIR." into rvc-dev am: cd2b3bab am: 20152e17 

Change-Id: I26f1fc6a872ec451c20291a31c261f1a11808319
parents 654c3ba5 20152e17

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }