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

Commit 95729c13 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Remember to skip the no-backup dir during recursions"

parents 47fb5f1e e32da05d

core/java/android/app/backup/BackupAgent.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -283,6 +283,7 @@ public abstract class BackupAgent extends ContextWrapper { 
        // all of the ones we will be traversing

        // all of the ones we will be traversing

        String rootDir = new File(appInfo.dataDir).getCanonicalPath();

        String rootDir = new File(appInfo.dataDir).getCanonicalPath();

        String filesDir = getFilesDir().getCanonicalPath();

        String filesDir = getFilesDir().getCanonicalPath();

        String nobackupDir = getNoBackupFilesDir().getCanonicalPath();

        String databaseDir = getDatabasePath("foo").getParentFile().getCanonicalPath();

        String databaseDir = getDatabasePath("foo").getParentFile().getCanonicalPath();

        String sharedPrefsDir = getSharedPrefsFile("foo").getParentFile().getCanonicalPath();

        String sharedPrefsDir = getSharedPrefsFile("foo").getParentFile().getCanonicalPath();

        String cacheDir = getCacheDir().getCanonicalPath();

        String cacheDir = getCacheDir().getCanonicalPath();
@@ -304,6 +305,7 @@ public abstract class BackupAgent extends ContextWrapper { 
        filterSet.add(databaseDir);

        filterSet.add(databaseDir);

        filterSet.add(sharedPrefsDir);

        filterSet.add(sharedPrefsDir);

        filterSet.add(filesDir);

        filterSet.add(filesDir);

        filterSet.add(nobackupDir);

        fullBackupFileTree(packageName, FullBackup.ROOT_TREE_TOKEN, rootDir, filterSet, data);

        fullBackupFileTree(packageName, FullBackup.ROOT_TREE_TOKEN, rootDir, filterSet, data);





        // Now do the same for the files dir, db dir, and shared prefs dir

        // Now do the same for the files dir, db dir, and shared prefs dir