summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-08-17 18:14:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-17 18:14:24 +0000
commit89e192b7a451e616a3c7a11aea077c92f224f01a (patch)
tree1ef177fd44c6f3bf1d1e29c4ca70709f600235e3
parente065a36fec8545eebd1633780f96bae378b07bdd (diff)
parentaf3ad0da0d444920c216cb048d0217e921026b19 (diff)
downloadcrosshatch-sepolicy-89e192b7a451e616a3c7a11aea077c92f224f01a.tar.gz
Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master
-rw-r--r--tracking_denials/hal_wlc.te2
-rw-r--r--vendor/google/file_contexts2
-rw-r--r--vendor/qcom/common/file_contexts4
3 files changed, 4 insertions, 4 deletions
diff --git a/tracking_denials/hal_wlc.te b/tracking_denials/hal_wlc.te
index 05df496..3508008 100644
--- a/tracking_denials/hal_wlc.te
+++ b/tracking_denials/hal_wlc.te
@@ -1,2 +1,2 @@
-# b/190686637
+# b/190690354
dontaudit hal_wlc sysfs_msm_subsys:dir search;
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index 5b17328..e92b978 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -4,7 +4,7 @@
/dev/maxfg_history u:object_r:maxfg_device:s0
/vendor/bin/hw/android\.hardware\.atrace@1\.0-service.pixel u:object_r:hal_atrace_default_exec:s0
-/vendor/bin/hw/android\.hardware\.contexthub@1\.1-service\.generic u:object_r:hal_contexthub_default_exec:s0
+/vendor/bin/hw/android\.hardware\.contexthub@1\.2-service\.generic u:object_r:hal_contexthub_default_exec:s0
/vendor/bin/hw/android\.hardware\.secure_element@1\.1-service-disabled u:object_r:hal_secure_element_default_exec:s0
/vendor/bin/init\.firstboot\.sh u:object_r:init-firstboot_exec:s0
/vendor/bin/init\.fingerprint\.sh u:object_r:init-fingerprint_exec:s0
diff --git a/vendor/qcom/common/file_contexts b/vendor/qcom/common/file_contexts
index 9fc7c15..b2e5e22 100644
--- a/vendor/qcom/common/file_contexts
+++ b/vendor/qcom/common/file_contexts
@@ -112,7 +112,7 @@
/vendor/bin/msm_irqbalance u:object_r:irqbalance_exec:s0
/vendor/bin/cnd u:object_r:cnd_exec:s0
/vendor/bin/easelmanagerd u:object_r:easel_exec:s0
-/vendor/bin/hw/android\.hardware\.usb@1\.2-service\.crosshatch u:object_r:hal_usb_impl_exec:s0
+/vendor/bin/hw/android\.hardware\.usb@1\.3-service\.crosshatch u:object_r:hal_usb_impl_exec:s0
/vendor/bin/chre u:object_r:chre_exec:s0
/vendor/bin/time_daemon u:object_r:time_daemon_exec:s0
/vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0
@@ -141,7 +141,7 @@
/vendor/bin/hw/android\.hardware\.health@2\.0-service\.crosshatch u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/vendor\.qti\.media\.c2@1\.0-service 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\.2-service-vendor u:object_r:hal_wlc_exec:s0
+/vendor/bin/hw/vendor\.google\.wireless_charger@1\.3-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
###############################################