Merge "update_verifier: read dir perms"
diff --git a/private/service_contexts b/private/service_contexts
index 23b2e28..de0caa9 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -47,6 +47,7 @@
 dumpstate                                 u:object_r:dumpstate_service:s0
 ethernet                                  u:object_r:ethernet_service:s0
 fingerprint                               u:object_r:fingerprint_service:s0
+font                                      u:object_r:font_service:s0
 android.hardware.fingerprint.IFingerprintDaemon u:object_r:fingerprintd_service:s0
 gfxinfo                                   u:object_r:gfxinfo_service:s0
 graphicsstats                             u:object_r:graphicsstats_service:s0
diff --git a/public/service.te b/public/service.te
index 858f0b0..d8da930 100644
--- a/public/service.te
+++ b/public/service.te
@@ -61,6 +61,7 @@
 type devicestoragemonitor_service, system_server_service, service_manager_type;
 type diskstats_service, system_api_service, system_server_service, service_manager_type;
 type display_service, app_api_service, system_server_service, service_manager_type;
+type font_service, app_api_service, system_server_service, service_manager_type;
 type netd_listener_service, system_server_service, service_manager_type;
 type DockObserver_service, system_server_service, service_manager_type;
 type dreams_service, app_api_service, system_server_service, service_manager_type;
diff --git a/public/system_server.te b/public/system_server.te
index e1c25c5..e11476c 100644
--- a/public/system_server.te
+++ b/public/system_server.te
@@ -4,6 +4,9 @@
 #
 type system_server, domain, domain_deprecated, mlstrustedsubject;
 
+# Attributes for passthrough hals
+typeattribute system_server hal_light;
+
 # For art.
 allow system_server dalvikcache_data_file:dir r_dir_perms;
 allow system_server dalvikcache_data_file:file { r_file_perms execute };