commit bf9f4c9fcba523d599178772c0f34c0a42b37ace
author Nick Kralevich <nnk@google.com> Thu Sep 12 12:28:34 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 12 12:28:34 2013 -0700
tree 40a6404d8df80ffb9dae076f585ac0d658c105c5
parent be8382fc01e9702cd6e2b0779e43f61a4132741d
parent 3c31b00971c9f0004852e41ff24d52ccfe681dd6

am 3c31b009: am 078d16a1: am 3381f765: am 3638a6bc: FileSystemPermissionTest: Add more directories

* commit '3c31b00971c9f0004852e41ff24d52ccfe681dd6':
  FileSystemPermissionTest: Add more 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 0a2d56c..a04209c 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -356,6 +356,7 @@
                     "/data/data/recovery/HTCFOTA",
                     "/data/data/recovery/OMADM",
                     "/data/data/shared",
+                    "/data/diag_logs",
                     "/data/dontpanic",
                     "/data/drm",
                     "/data/drm/fwdlock",
@@ -431,6 +432,7 @@
                     "/data/system",
                     "/data/tmp",
                     "/data/tombstones",
+                    "/data/tombstones/ramdump",
                     "/data/tpapi",
                     "/data/tpapi/etc",
                     "/data/tpapi/etc/tpa",