summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/backup
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-04-15 14:32:34 -0700
committerChristopher Tate <ctate@google.com>2015-04-15 14:32:34 -0700
commite32da05d94adba9432610fbb7544e062743af303 (patch)
tree545781cf1fdd0bbdf226e010af957ac51bcbb1d8 /core/java/android/app/backup
parent205bbc40b4a3046ca3dba256535f0322f5b336e9 (diff)
downloadframeworks_base-e32da05d94adba9432610fbb7544e062743af303.zip
frameworks_base-e32da05d94adba9432610fbb7544e062743af303.tar.gz
frameworks_base-e32da05d94adba9432610fbb7544e062743af303.tar.bz2
Remember to skip the no-backup dir during recursions
Change-Id: I34c46f9b23cd0ddfa2392e953d8d8cc03bcea5a8
Diffstat (limited to 'core/java/android/app/backup')
-rw-r--r--core/java/android/app/backup/BackupAgent.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/backup/BackupAgent.java b/core/java/android/app/backup/BackupAgent.java
index 2bf267a..d8556a2 100644
--- a/core/java/android/app/backup/BackupAgent.java
+++ b/core/java/android/app/backup/BackupAgent.java
@@ -283,6 +283,7 @@ public abstract class BackupAgent extends ContextWrapper {
// all of the ones we will be traversing
String rootDir = new File(appInfo.dataDir).getCanonicalPath();
String filesDir = getFilesDir().getCanonicalPath();
+ String nobackupDir = getNoBackupFilesDir().getCanonicalPath();
String databaseDir = getDatabasePath("foo").getParentFile().getCanonicalPath();
String sharedPrefsDir = getSharedPrefsFile("foo").getParentFile().getCanonicalPath();
String cacheDir = getCacheDir().getCanonicalPath();
@@ -304,6 +305,7 @@ public abstract class BackupAgent extends ContextWrapper {
filterSet.add(databaseDir);
filterSet.add(sharedPrefsDir);
filterSet.add(filesDir);
+ filterSet.add(nobackupDir);
fullBackupFileTree(packageName, FullBackup.ROOT_TREE_TOKEN, rootDir, filterSet, data);
// Now do the same for the files dir, db dir, and shared prefs dir