1 files changed, 5 insertions, 3 deletions
diff --git a/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java b/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java
index 89f84fc..e453cf5 100644
--- a/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java
+++ b/packages/SharedStorageBackup/src/com/android/sharedstoragebackup/SharedStorageAgent.java
@@ -8,11 +8,11 @@ import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
+import android.util.ArraySet;
 import android.util.Slog;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.HashSet;
 
 public class SharedStorageAgent extends FullBackupAgent {
     static final String TAG = "SharedStorageAgent";
@@ -42,7 +42,7 @@ public class SharedStorageAgent extends FullBackupAgent {
             if (DEBUG) Slog.i(TAG, "Backing up " + mVolumes.length + " shared volumes");
             // Ignore all apps' getExternalFilesDir() content; it is backed up as part of
             // each app-specific payload.
-            HashSet<String> externalFilesDirFilter = new HashSet<String>();
+            ArraySet<String> externalFilesDirFilter = new ArraySet();
             final File externalAndroidRoot = new File(Environment.getExternalStorageDirectory(),
                     Environment.DIRECTORY_ANDROID);
             externalFilesDirFilter.add(externalAndroidRoot.getCanonicalPath());
@@ -53,7 +53,9 @@ public class SharedStorageAgent extends FullBackupAgent {
                 //     shared/N/path/to/file
                 // The restore will then extract to the given volume
                 String domain = FullBackup.SHARED_PREFIX + i;
-                fullBackupFileTree(null, domain, v.getPath(), externalFilesDirFilter, output);
+                fullBackupFileTree(null, domain, v.getPath(),
+                        null /* manifestExcludes */,
+                        externalFilesDirFilter /* systemExcludes */, output);
             }
         }
     }