summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-07-17 03:07:07 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-07-17 03:07:07 +0000
commit3958ba50ec6645ec3f5cc5a80ea8ab6a794242b2 (patch)
tree7530f77189e9f00f591b0fbef7580dbdac57c5db
parent45a26f6b259e892891205e50a1c86e95c477f59f (diff)
parentf97c1b6224827c0eac048135ddf04b1eec3bba57 (diff)
Snap for 4896779 from f97c1b6224827c0eac048135ddf04b1eec3bba57 to pi-dr1-release
Change-Id: I868ea43f311046c512d23839202ff0bdc997dc40
-rw-r--r--vendor/google/hal_health_default.te3
-rw-r--r--vendor/qcom/common/file_contexts1
-rw-r--r--vendor/qcom/common/hal_graphics_composer_default.te4
-rw-r--r--vendor/qcom/common/hwservice_contexts1
4 files changed, 9 insertions, 0 deletions
diff --git a/vendor/google/hal_health_default.te b/vendor/google/hal_health_default.te
index 9a18634..49e6207 100644
--- a/vendor/google/hal_health_default.te
+++ b/vendor/google/hal_health_default.te
@@ -16,3 +16,6 @@ allow hal_health_default sysfs_batteryinfo:file rw_file_perms;
get_prop(hal_health_default, vendor_shutdown_prop)
set_prop(hal_health_default, vendor_shutdown_prop)
+
+allow hal_health_default self:capability2 wake_alarm;
+allow hal_health_default mnt_vendor_file:dir search;
diff --git a/vendor/qcom/common/file_contexts b/vendor/qcom/common/file_contexts
index a883cae..e3f3730 100644
--- a/vendor/qcom/common/file_contexts
+++ b/vendor/qcom/common/file_contexts
@@ -142,6 +142,7 @@
/vendor/bin/hw/hardware\.google\.media\.c2@1\.0-service-software u:object_r:mediacodec_exec:s0
/vendor/bin/hw/vendor\.qti\.hardware\.display\.allocator@1\.0-service u:object_r:hal_graphics_allocator_default_exec:s0
/vendor/bin/hw/vendor\.google\.wireless_charger@1\.0-service-vendor u:object_r:hal_wlc_exec:s0
+/vendor/bin/hw/hardware\.google\.light@1\.0-service u:object_r:hal_light_default_exec:s0
###############################################
# same-process HAL files and their dependencies
diff --git a/vendor/qcom/common/hal_graphics_composer_default.te b/vendor/qcom/common/hal_graphics_composer_default.te
index ad574f1..50815e2 100644
--- a/vendor/qcom/common/hal_graphics_composer_default.te
+++ b/vendor/qcom/common/hal_graphics_composer_default.te
@@ -51,3 +51,7 @@ userdebug_or_eng(`
dontaudit hal_graphics_composer_default kernel:system module_request;
dontaudit hal_graphics_composer_default vendor_display_prop:file r_file_perms;
+
+#allow composer access hal_light
+hal_client_domain(hal_graphics_composer_default, hal_light);
+allow hal_graphics_composer_default hal_light_hwservice:hwservice_manager find;
diff --git a/vendor/qcom/common/hwservice_contexts b/vendor/qcom/common/hwservice_contexts
index a299fd8..4d81c64 100644
--- a/vendor/qcom/common/hwservice_contexts
+++ b/vendor/qcom/common/hwservice_contexts
@@ -22,3 +22,4 @@ hardware.google.media.c2::IComponentStore u:object_r:hal_c
vendor.google_paintbox::IManagerService u:object_r:hal_paintbox_hwservice:s0
hardware.google.pixelstats::IPixelStats u:object_r:hal_pixelstats_hwservice:s0
vendor.google.wireless_charger::IWirelessCharger u:object_r:hal_wlc_hwservice:s0
+hardware.google.light::ILight u:object_r:hal_light_hwservice:s0