commit fc75c0d38ce80a85789c81fc6a707b3be8055fdc
author Geremy Condra <gcondra@google.com> Wed Mar 20 21:35:08 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 20 21:35:08 2013 -0700
tree 668afb5b663ae3767e04906d6b2bc88b6a90b801
parent ab958358dcbe98b9c1f6b26bc96f78d1a9f462c7
parent a2453f882f6a4aae8585bd7205f380e45f5b3813

am a2453f88: am a4a53c4e: Merge "Exceptions for world writeable selinuxfs files"

* commit 'a2453f882f6a4aae8585bd7205f380e45f5b3813':
  Exceptions for world writeable selinuxfs files

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 4eb47c2..c5c158f 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -566,7 +566,13 @@
 
     private static final Set<File> SYS_EXCEPTIONS = new HashSet<File>(
             Arrays.asList(
-                new File("/sys/kernel/debug/tracing/trace_marker")
+                new File("/sys/kernel/debug/tracing/trace_marker"),
+                new File("/sys/fs/selinux/member"),
+                new File("/sys/fs/selinux/user"),
+                new File("/sys/fs/selinux/relabel"),
+                new File("/sys/fs/selinux/create"),
+                new File("/sys/fs/selinux/access"),
+                new File("/sys/fs/selinux/context")
             ));
 
     @LargeTest