Merge "sepolicy_vndr: trinket: Add mdss_rotator related rule for hal_camera_default"
diff --git a/generic/vendor/common/app.te b/generic/vendor/common/app.te
index b6d0824..7648f6c 100644
--- a/generic/vendor/common/app.te
+++ b/generic/vendor/common/app.te
@@ -24,6 +24,10 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Changes from Qualcomm Innovation Center are provided under the following license:
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
# For the camera app
get_prop(appdomain, vendor_camera_prop)
@@ -31,6 +35,9 @@
#Allow all apps to have read access to vendor_adsprpc_prop
get_prop(appdomain, vendor_adsprpc_prop)
+#Allow all apps to have read access to vendor_display_prop
+get_prop(appdomain, vendor_display_prop)
+
# Allow all apps to open and send ioctl to npu device
allow appdomain vendor_npu_device:chr_file r_file_perms;
diff --git a/qva/vendor/kona/file_contexts b/qva/vendor/kona/file_contexts
index 4328793..69b69e7 100644
--- a/qva/vendor/kona/file_contexts
+++ b/qva/vendor/kona/file_contexts
@@ -7,6 +7,7 @@
#umd_service
/vendor/bin/hw/vendor\.qti\.hardware\.umd@1\.0-service u:object_r:vendor_hal_umd_qti_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@2\.[0-9]+-external-service_64 u:object_r:hal_camera_default_exec:s0
# UFS Devices
/dev/block/platform/soc/1d84000.ufshc/by-name/system u:object_r:system_block_device:s0
diff --git a/qva/vendor/trinket/device.te b/qva/vendor/trinket/device.te
index 1fe970a..0fc7d53 100644
--- a/qva/vendor/trinket/device.te
+++ b/qva/vendor/trinket/device.te
@@ -1,4 +1,6 @@
# Copyright (c) 2019, The Linux Foundation. All rights reserved.
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@@ -39,4 +41,6 @@
type vendor_msm_rtac_device, dev_type;
type vendor_media_aac_device, dev_type;
type vendor_media_evrc_device, dev_type;
-type vendor_media_qcelp_device, dev_type;
\ No newline at end of file
+type vendor_media_qcelp_device, dev_type;
+type vendor_media_wma_device, dev_type;
+type vendor_media_wmapro_device, dev_type;
diff --git a/qva/vendor/trinket/file_contexts b/qva/vendor/trinket/file_contexts
index 0119921..248569c 100644
--- a/qva/vendor/trinket/file_contexts
+++ b/qva/vendor/trinket/file_contexts
@@ -201,4 +201,8 @@
/dev/msm_evrc_in u:object_r:vendor_media_evrc_device:s0
/dev/msm_qcelp_in u:object_r:vendor_media_qcelp_device:s0
+#msmwma & msm_wmapro
+/dev/msm_wma u:object_r:vendor_media_wma_device:s0
+/dev/msm_wmapro u:object_r:vendor_media_wmapro_device:s0
+
/sys/devices/platform/soc/5900000.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpu_model u:object_r:vendor_sysfs_kgsl_gpu_model:s0
diff --git a/qva/vendor/trinket/genfs_contexts b/qva/vendor/trinket/genfs_contexts
index cea370b..0fa9105 100644
--- a/qva/vendor/trinket/genfs_contexts
+++ b/qva/vendor/trinket/genfs_contexts
@@ -121,6 +121,7 @@
genfscon sysfs /devices/platform/soc/soc:qcom,cpu-cpu-ddr-bw/devfreq u:object_r:vendor_sysfs_devfreq:s0
genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/kgsl/kgsl-3d0/devfreq u:object_r:vendor_sysfs_devfreq:s0
genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/devfreq u:object_r:vendor_sysfs_devfreq:s0
+genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpu_available_frequencies u:object_r:vendor_sysfs_devfreq:s0
genfscon sysfs /devices/platform/soc/soc:qcom,gpubw/devfreq u:object_r:vendor_sysfs_devfreq:s0
genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-busmon/devfreq u:object_r:vendor_sysfs_devfreq:s0
genfscon sysfs /devices/platform/soc/soc:qcom,cpu4-cpu-ddr-lat/devfreq u:object_r:vendor_sysfs_devfreq:s0
diff --git a/qva/vendor/trinket/hal_graphics_allocator_default.te b/qva/vendor/trinket/hal_graphics_allocator_default.te
index fed16a3..b84b877 100644
--- a/qva/vendor/trinket/hal_graphics_allocator_default.te
+++ b/qva/vendor/trinket/hal_graphics_allocator_default.te
@@ -3,4 +3,6 @@
allow hal_graphics_allocator_default vendor_sysfs_kgsl_gpu_model:file r_file_perms;
allow hal_graphics_allocator_default vendor_dmabuf_system_heap_device:chr_file r_file_perms;
-allow hal_graphics_allocator_default vendor_dmabuf_system_uncached_heap_device:chr_file r_file_perms;
\ No newline at end of file
+allow hal_graphics_allocator_default vendor_dmabuf_system_uncached_heap_device:chr_file r_file_perms;
+allow hal_graphics_allocator_default vendor_dmabuf_display_heap_device:chr_file r_file_perms;
+allow hal_graphics_allocator_default vendor_membuf_dev:chr_file r_file_perms;
diff --git a/qva/vendor/trinket/mediacodec.te b/qva/vendor/trinket/mediacodec.te
index b1c5112..8aa9f2e 100644
--- a/qva/vendor/trinket/mediacodec.te
+++ b/qva/vendor/trinket/mediacodec.te
@@ -7,4 +7,6 @@
allow mediacodec vendor_media_aac_device:chr_file rw_file_perms;
allow mediacodec vendor_media_evrc_device:chr_file rw_file_perms;
allow mediacodec vendor_media_qcelp_device:chr_file rw_file_perms;
+allow mediacodec vendor_media_wma_device:chr_file rw_file_perms;
+allow mediacodec vendor_media_wmapro_device:chr_file rw_file_perms;
allow mediacodec logdr_socket:sock_file { write };