commit 9205b607c796c53d35a97b2be8915600a141c502
author Unsuk Jung <unsuk@google.com> Tue Aug 27 12:01:29 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 27 12:01:29 2013 -0700
tree 59157f862f712ed9494a13005efc9b0da0c70797
parent cadd5cd6680b4b937ca5aa9cc80ce4da7e5a141f
parent 57181a07bb49a8af1493c3b8964c436a7d7f6707

am 57181a07: am 23fc8b64: Merge "Adding exceptions for File system permission test" into jb-mr2-dev

* commit '57181a07bb49a8af1493c3b8964c436a7d7f6707':
  Adding exceptions for File system permission test

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 f42b7f2..db88cea 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -750,7 +750,9 @@
                 new File("/dev/tty"),
                 new File("/dev/urandom"),
                 new File("/dev/xt_qtaguid"),  // b/9088251
-                new File("/dev/zero")
+                new File("/dev/zero"),
+                new File("/dev/fimg2d"),      // b/10428016
+                new File("/dev/mobicore-user") // b/10428016
             ));
 
     public void testAllCharacterDevicesAreSecure() throws Exception {