commit d6b45ffc310a9352490e028dd380015957ad1bc4
author Nick Kralevich <nnk@google.com> Fri Aug 24 07:36:37 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 24 07:36:37 2012 -0700
tree ba7b4c3f0114896ef523aff05c0a83c6984fd719
parent 37a674c397548257c9d5bbca29d2dc463e1cd8bf
parent 5ce11a16ede48b2609443fdbc95d754d82477c78

am 5ce11a16: am 1eebc534: am 092c8863: am 7a28c6d7: Merge "FileSystemPermissionTest: Add directories"

* commit '5ce11a16ede48b2609443fdbc95d754d82477c78':
  FileSystemPermissionTest: Add directories

tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java

diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index 8ea02ae..0ffbe3c 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -225,6 +225,8 @@
                     "/app-cache/ciq/socket",
                     "/cache/fotapkg",
                     "/cache/fotapkg/tmp",
+                    "/data/_SamsungBnR_",
+                    "/data/_SamsungBnR_/BR",
                     "/data/2nd-init",
                     "/data/amit",
                     "/data/anr",
@@ -237,6 +239,7 @@
                     "/data/btips/TI",
                     "/data/btips/TI/opp",
                     "/data/calibration",
+                    "/data/clipboard",
                     "/data/clp",
                     "/data/dalvik-cache",
                     "/data/data",
@@ -274,6 +277,7 @@
                     "/data/drm/rights",
                     "/data/dump",
                     "/data/emt",
+                    "/data/factory",
                     "/data/fota",
                     "/data/gpscfg",
                     "/data/hwvefs",