Merge "allow system_server to access files under /sys/kernel/ion/"
diff --git a/private/service_contexts b/private/service_contexts
index 7540705..908ff68 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -100,6 +100,7 @@
ims u:object_r:radio_service:s0
imms u:object_r:imms_service:s0
incremental u:object_r:incremental_service:s0
+incremental_service u:object_r:incremental_service:s0
ipsec u:object_r:ipsec_service:s0
ircsmessage u:object_r:radio_service:s0
iris u:object_r:iris_service:s0
diff --git a/private/system_server.te b/private/system_server.te
index c9ed298..c1342d8 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -17,6 +17,9 @@
allow system_server zygote_tmpfs:file read;
allow system_server appdomain_tmpfs:file { getattr map read write };
+# For Incremental Service to check if incfs is available
+allow system_server proc_filesystems:file r_file_perms;
+
# For art.
allow system_server dalvikcache_data_file:dir r_dir_perms;
allow system_server dalvikcache_data_file:file r_file_perms;