Merge 1a332e6b327f5b0e6d2524948dba5f327994e749 on remote branch

Change-Id: Idcdfce58db79a1564a22132991511450c2cdfc64

9 files changed, 27 insertions, 4 deletions

diff --git a/generic/vendor/common/qtelephony.te b/generic/vendor/common/qtelephony.te
index 19058e26..c708c47d 100644
--- a/generic/vendor/common/qtelephony.te
+++ b/generic/vendor/common/qtelephony.te
@@ -32,5 +32,7 @@ get_prop(vendor_qtelephony, vendor_audio_prop)
 get_prop(vendor_qtelephony, vendor_video_prop)
 
 allow vendor_qtelephony vendor_hal_imsrtp_hwservice:hwservice_manager find;
+#dontaudit for U upgrade since AServiceManager_isDeclared internally does find
+dontaudit vendor_qtelephony default_android_service:service_manager find;
 binder_call(vendor_qtelephony, vendor_hal_imsrtp)
 hal_client_domain(vendor_qtelephony , vendor_hal_datafactory_qti)
diff --git a/generic/vendor/common/vndservice.te b/generic/vendor/common/vndservice.te
index 0b659950..3195fa46 100644
--- a/generic/vendor/common/vndservice.te
+++ b/generic/vendor/common/vndservice.te
@@ -29,4 +29,3 @@ type vendor_per_mgr_service,       vndservice_manager_type;
 type vendor_qfeatenab_client_service,     vndservice_manager_type;
 type vendor_xtra_service,                 vndservice_manager_type;
 type vendor_qms_service,                  vndservice_manager_type;
-type vendor_qhdcservice,                  vndservice_manager_type;
diff --git a/generic/vendor/common/vndservice_contexts b/generic/vendor/common/vndservice_contexts
index c291976f..eb9fb4f2 100644
--- a/generic/vendor/common/vndservice_contexts
+++ b/generic/vendor/common/vndservice_contexts
@@ -29,4 +29,3 @@ featenab_client.service                 u:object_r:vendor_qfeatenab_client_servi
 vendor.qcom.PeripheralManager           u:object_r:vendor_per_mgr_service:s0
 vendor.qti.gnss.xtra.ILocAidlXtraService  u:object_r:vendor_xtra_service:s0
 vendor.qti.data.qmsservice.IQmsService  u:object_r:vendor_qms_service:s0
-vendor_qhdcservice                           u:object_r:vendor_qhdcservice:s0
diff --git a/qva/vendor/bengal/mediacodec.te b/qva/vendor/bengal/mediacodec.te
new file mode 100644
index 00000000..b1f0ffcc
--- /dev/null
+++ b/qva/vendor/bengal/mediacodec.te
@@ -0,0 +1,7 @@
+#Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+#SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# Allow mediacodec to create DisplayConfig client interface
+hal_client_domain(mediacodec, hal_graphics_composer)
+hal_client_domain(mediacodec, vendor_hal_perf)
+binder_call(mediacodec, hal_graphics_composer_default)
diff --git a/qva/vendor/common/init_shell.te b/qva/vendor/common/init_shell.te
index a3e16a28..56890ff4 100644
--- a/qva/vendor/common/init_shell.te
+++ b/qva/vendor/common/init_shell.te
@@ -62,6 +62,9 @@ allow vendor_qti_init_shell {
     vendor_sysfs_sd
 }:file w_file_perms;
 
+# Allow init shell to access /sys/class/kgsl/kgsl/ nodes
+allow vendor_qti_init_shell vendor_sysfs_kgsl:file w_file_perms;
+
 # Allow init shell to access vendor pasr properties
 set_prop(vendor_qti_init_shell, vendor_pasr_prop)
 set_prop(vendor_qti_init_shell, ctl_start_prop)
diff --git a/qva/vendor/common/qms.te b/qva/vendor/common/qms.te
index 0302365e..d26c3ffe 100644
--- a/qva/vendor/common/qms.te
+++ b/qva/vendor/common/qms.te
@@ -91,7 +91,6 @@ hal_client_domain(vendor_qms,hal_wifi_hostapd)
 hal_client_domain(vendor_qms,hal_wifi_supplicant)
 hal_client_domain(vendor_qms, hal_bluetooth)
 
-hal_attribute_service(vendor_hal_qms_qti, vendor_qhdcservice)
 net_domain(vendor_qms)
 
 #glink
diff --git a/qva/vendor/kona/device.te b/qva/vendor/kona/device.te
new file mode 100644
index 00000000..e2cca8ac
--- /dev/null
+++ b/qva/vendor/kona/device.te
@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+#define cec device
+type vendor_cec_device, dev_type;
diff --git a/qva/vendor/kona/file_contexts b/qva/vendor/kona/file_contexts
index 6c8713b3..f65da4f6 100644
--- a/qva/vendor/kona/file_contexts
+++ b/qva/vendor/kona/file_contexts
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
 # Dev block nodes
-
+/dev/cec[0-9]*        u:object_r:vendor_cec_device:s0
 # UFS Devices
 /dev/block/platform/soc/1d84000.ufshc/by-name/system                u:object_r:system_block_device:s0
 /dev/block/platform/soc/1d84000.ufshc/by-name/vendor                u:object_r:system_block_device:s0
diff --git a/qva/vendor/kona/hal_cec.te b/qva/vendor/kona/hal_cec.te
new file mode 100644
index 00000000..700bb720
--- /dev/null
+++ b/qva/vendor/kona/hal_cec.te
@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+allow hal_tv_cec_default vendor_cec_device:chr_file rw_file_perms;
+get_prop(hal_tv_cec_default, vendor_display_prop);
+allow hal_tv_cec_default vendor_qdisplay_service:service_manager find;
+get_prop(hal_tv_cec_default,boot_status_prop);
+binder_use(hal_tv_cec_default);
+vndbinder_use(hal_tv_cec_default);