Merge changes from topic 'sefiles_relabel' into oc-dev am: 394539c5

am: 719edb06

Change-Id: I162eaf1a4d61cbef00f531d779ee5a8282369b66

private/file_contexts

@@ -249,6 +249,7 @@
 /system/bin/virtual_touchpad     u:object_r:virtual_touchpad_exec:s0
 /system/bin/vr_wm                u:object_r:vr_wm_exec:s0
 /system/bin/hw/android\.hidl\.allocator@1\.0-service          u:object_r:hal_allocator_default_exec:s0
+/system/etc/selinux/plat_mac_permissions.xml u:object_r:mac_perms_file:s0
 /system/etc/selinux/plat_property_contexts  u:object_r:property_contexts_file:s0
 /system/etc/selinux/plat_service_contexts  u:object_r:service_contexts_file:s0
 /system/etc/selinux/plat_file_contexts  u:object_r:file_contexts_file:s0
@@ -261,6 +262,7 @@
 #
 /vendor(/.*)?		u:object_r:system_file:s0
 /vendor/etc/selinux/mapping_sepolicy.cil       u:object_r:sepolicy_file:s0
+/vendor/etc/selinux/nonplat_mac_permissions.xml u:object_r:mac_perms_file:s0
 /vendor/etc/selinux/nonplat_property_contexts   u:object_r:property_contexts_file:s0
 /vendor/etc/selinux/nonplat_service_contexts    u:object_r:service_contexts_file:s0
 /vendor/etc/selinux/nonplat_file_contexts   u:object_r:file_contexts_file:s0

private/system_server.te

@@ -232,6 +232,8 @@ allow system_server mediadrmserver:udp_socket rw_socket_perms;
 
 # Get file context
 allow system_server file_contexts_file:file r_file_perms;
+# access for mac_permissions
+allow system_server mac_perms_file: file r_file_perms;
 # Check SELinux permissions.
 selinux_check_access(system_server)
 

public/file.te

@@ -259,6 +259,9 @@ type gps_control, file_type;
 # file_contexts files
 type file_contexts_file, file_type;
 
+# mac_permissions file
+type mac_perms_file, file_type;
+
 # property_contexts file
 type property_contexts_file, file_type;