Merge "Define gpu_service and allow surfaceflinger to provide it" into nyc-dev
diff --git a/service.te b/service.te
index 2915e95..71f8f3b 100644
--- a/service.te
+++ b/service.te
@@ -6,6 +6,7 @@
type gatekeeper_service, app_api_service, service_manager_type;
type fingerprintd_service, service_manager_type;
type batteryproperties_service, app_api_service, service_manager_type;
+type gpu_service, service_manager_type;
type inputflinger_service, service_manager_type;
type keystore_service, service_manager_type;
type mediaserver_service, service_manager_type;
diff --git a/service_contexts b/service_contexts
index 9b049e3..c1fe961 100644
--- a/service_contexts
+++ b/service_contexts
@@ -43,6 +43,7 @@
android.hardware.fingerprint.IFingerprintDaemon u:object_r:fingerprintd_service:s0
gfxinfo u:object_r:gfxinfo_service:s0
graphicsstats u:object_r:graphicsstats_service:s0
+gpu u:object_r:gpu_service:s0
hardware u:object_r:hardware_service:s0
hardware_properties u:object_r:hardware_properties_service:s0
hdmi_control u:object_r:hdmi_control_service:s0
diff --git a/surfaceflinger.te b/surfaceflinger.te
index 2164010..38f1dad 100644
--- a/surfaceflinger.te
+++ b/surfaceflinger.te
@@ -56,6 +56,7 @@
allow surfaceflinger mediaserver_service:service_manager find;
allow surfaceflinger permission_service:service_manager find;
allow surfaceflinger power_service:service_manager find;
+allow surfaceflinger gpu_service:service_manager { add find };
allow surfaceflinger surfaceflinger_service:service_manager { add find };
allow surfaceflinger window_service:service_manager find;