Merge tag 'LA.VENDOR.13.2.0.r1-22400-KAILUA.QSSI14.0' into staging/lineage-21.0_merge-LA.VENDOR.13.2.0.r1-22400-KAILUA.QSSI14.0

LA.VENDOR.13.2.0.r1-22400-KAILUA.QSSI14.0

# By Xinzheng Long (3) and others
# Via Gerrit - the friendly Code Review server (20) and others
* tag 'LA.VENDOR.13.2.0.r1-22400-KAILUA.QSSI14.0': (31 commits)
  sepolicy_vndr: Add rules for hal_vibrator_default
  Add rule to allow access to audio HAL
  sepolicy_vndr: Add rules for secure dmabuf.
  sepolicy: add rules to hal_vibrator_default using get_prop macros
  sepolicy: add rules for vendor_hal_drm_widevine
  sepolicy_vndr: Allow hal_wifi to write into tombstone on user variants
  sepolicy_vndr: Ignore denial due to hw perf for Episteme
  sepolicy: Add permission to display vendor property
  sepolicy_vndr: Add rules for hal_vibrator_default
  Add sepolicy rules for power supply nodes.
  sepolicy_vndr: trinket: Add sepolicies for sysfs
  sepolicy_vndr: Add rules for display heap device
  sepolicy_vndr: trinket: Updated camera sysfs path
  sepolicy_vndr: trinket: Add mdss_rotator related rule for hal_camera_default
  Add sepolicy rule for msm_wma & msm_wmapro to rw file
  sepolicy_vndr: Allow apps to have read access to vendor_display_prop
  sepolicy_vndr: Allow apps to have read access to vendor_display_prop
  sepolicy_vndr: Add sepolicy rules for vold
  sepolicy_vndr: Add generic lablel for gpu_available_frequencies
  sepolicy: Adds support for external camera
  ...

Change-Id: Ia5f94a1d3753e1fefebe80e2d2087bba536fd5f5
diff --git a/generic/vendor/common/app.te b/generic/vendor/common/app.te
index 5c48801..13defbd 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/generic/vendor/common/hal_vibrator_default.te b/generic/vendor/common/hal_vibrator_default.te
index 41de4ab..b58c450 100644
--- a/generic/vendor/common/hal_vibrator_default.te
+++ b/generic/vendor/common/hal_vibrator_default.te
@@ -68,3 +68,6 @@
 # read/write permissions to haptics sysfs node
 r_dir_file(hal_vibrator_default, vendor_sysfs_haptics)
 allow hal_vibrator_default vendor_sysfs_haptics:file rw_file_perms;
+
+# default permissions for qc_aon_node
+get_prop(hal_vibrator_default, vendor_qc_aon_prop)
diff --git a/generic/vendor/common/hal_wifi.te b/generic/vendor/common/hal_wifi.te
index db94262..3f87dc0 100644
--- a/generic/vendor/common/hal_wifi.te
+++ b/generic/vendor/common/hal_wifi.te
@@ -56,10 +56,8 @@
 allow hal_wifi proc_net:file write;
 
 # allow hal_wifi to write into /data/vendor/tombstones/wifi
-userdebug_or_eng(`
-  allow hal_wifi_server vendor_tombstone_data_file:dir rw_dir_perms;
-  allow hal_wifi_server vendor_tombstone_data_file:file create_file_perms;
-')
+allow hal_wifi_server vendor_tombstone_data_file:dir rw_dir_perms;
+allow hal_wifi_server vendor_tombstone_data_file:file create_file_perms;
 
 # allow hal_wifi to operate on bridged interfaces
 allowxperm hal_wifi_default self:udp_socket ioctl { SIOCBRADDBR
diff --git a/generic/vendor/crow/hal_camera_default.te b/generic/vendor/crow/hal_camera_default.te
index 82e1ea7..44ff7be 100644
--- a/generic/vendor/crow/hal_camera_default.te
+++ b/generic/vendor/crow/hal_camera_default.te
@@ -25,6 +25,10 @@
 # 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
+
 allow hal_camera_default tee_device:chr_file rw_file_perms;
 allow hal_camera_default vendor_dmabuf_qseecom_heap_device:chr_file r_file_perms;
 allow hal_camera_default vendor_dmabuf_qseecom_ta_heap_device:chr_file r_file_perms;
@@ -34,3 +38,4 @@
 allow hal_camera_default vendor_vm_cp_non_pixel_device:chr_file r_file_perms;
 allow hal_camera_default vendor_vm_cp_pixel_device:chr_file r_file_perms;
 
+dontaudit hal_camera_default vendor_hal_qspmhal_hwservice:hwservice_manager find;
diff --git a/generic/vendor/kalama/file_contexts b/generic/vendor/kalama/file_contexts
index 6d3a0eb..dc42fbd 100644
--- a/generic/vendor/kalama/file_contexts
+++ b/generic/vendor/kalama/file_contexts
@@ -315,6 +315,9 @@
 /vendor/bin/hw/vendor\.aks\.gamepad@1\.0-service      u:object_r:hal_gamepad_default_exec:s0
 /dev/aks_input                       u:object_r:vendor_aks_chr_device:s0
 
+#Gfx
+/(vendor|system/vendor)/bin/init\.qti\.graphics\.sh  u:object_r:vendor_qti_graphics_boot_exec:s0
+
 # Microdump collector parameters
 /sys/module/microdump_collector/parameters/.*  u:object_r:vendor_sysfs_microdump:s0
 /vendor/bin/usbudev     u:object_r:vendor_usbudev_qti_exec:s0
diff --git a/generic/vendor/kalama/vendor_qti_graphics_boot.te b/generic/vendor/kalama/vendor_qti_graphics_boot.te
new file mode 100644
index 0000000..4a9b66e
--- /dev/null
+++ b/generic/vendor/kalama/vendor_qti_graphics_boot.te
@@ -0,0 +1,11 @@
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+type vendor_qti_graphics_boot, domain;
+type vendor_qti_graphics_boot_exec, exec_type, vendor_file_type, file_type;
+
+init_daemon_domain(vendor_qti_graphics_boot)
+
+#============= qti_graphics_boot ==============
+set_prop(vendor_qti_graphics_boot, vendor_display_prop)
+allow vendor_qti_graphics_boot vendor_toolbox_exec:file rx_file_perms;
diff --git a/qva/vendor/common/qvrd_vndr.te b/qva/vendor/common/qvrd_vndr.te
index d2a3ca6..cb7019d 100644
--- a/qva/vendor/common/qvrd_vndr.te
+++ b/qva/vendor/common/qvrd_vndr.te
@@ -199,3 +199,6 @@
 #tsf node permission
 allow vendor_qvrd_vndr sysfs_net:dir r_dir_perms;
 allow vendor_qvrd_vndr sysfs_net:file r_file_perms;
+
+#Allow audio hal permission
+hal_client_domain(vendor_qvrd_vndr, hal_audio);
diff --git a/qva/vendor/crow/hal_bootctl_default.te b/qva/vendor/crow/hal_bootctl_default.te
index fc697b5..3fa6818 100644
--- a/qva/vendor/crow/hal_bootctl_default.te
+++ b/qva/vendor/crow/hal_bootctl_default.te
@@ -3,3 +3,6 @@
 
 #for hal_bootctl_default
 allow hal_bootctl_default vendor_sysfs_scsi_host:dir search;
+
+#============= vold ==============
+allow vold vendor_sysfs_scsi_host:file write;
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/kona/hal_camera.te b/qva/vendor/kona/hal_camera.te
index 7a5a831..a8251f4 100644
--- a/qva/vendor/kona/hal_camera.te
+++ b/qva/vendor/kona/hal_camera.te
@@ -19,3 +19,6 @@
 #Allow access to /data/vendor/camera
 allow hal_camera_default vendor_camera_data_file:dir { add_name write };
 allow hal_camera_default vendor_camera_data_file:file { create getattr open write };
+
+#Allow accessto vendor display properties
+get_prop(hal_camera_default, vendor_display_prop);
diff --git a/qva/vendor/test/episteme_app.te b/qva/vendor/test/episteme_app.te
index 9d96211..0ad44b8 100644
--- a/qva/vendor/test/episteme_app.te
+++ b/qva/vendor/test/episteme_app.te
@@ -8,3 +8,4 @@
 hal_client_domain(vendor_episteme_app, vendor_hal_qms_qti)
 hal_client_domain(vendor_episteme_app, vendor_hal_qesdhal)
 get_prop(vendor_episteme_app, vendor_episteme_prop)
+dontaudit vendor_episteme_app vendor_hal_perf_hwservice:hwservice_manager find;
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 c004202..726b1cb 100644
--- a/qva/vendor/trinket/file_contexts
+++ b/qva/vendor/trinket/file_contexts
@@ -25,12 +25,18 @@
 # 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
+
 # Dev block nodes
 
 #Primary storage device nodes
 /dev/block/mmcblk0boot1                                                         u:object_r:root_block_device:s0
 /dev/block/mmcblk0boot0                                                         u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                                          u:object_r:vendor_rpmb_device:s0
+/dev/mmcblk0rpmb                                                                u:object_r:vendor_rpmb_device:s0
 /dev/block/mmcblk0                                                              u:object_r:root_block_device:s0
 
 # UFS Devices
@@ -178,6 +184,9 @@
 # Brightness permission
 /sys/devices/platform/soc/5e00000.qcom,mdss_mdp/backlight(/.*)?     u:object_r:vendor_sysfs_graphics:s0
 
+#subsys nodes
+/sys/devices/platform/soc/6080000.remoteproc-mss/remoteproc/remoteproc[0-9]+/name u:object_r:vendor_sysfs_ssr:s0
+/sys/devices/platform/soc/6080000.remoteproc-mss/remoteproc/remoteproc[0-9]+/recovery u:object_r:vendor_sysfs_ssr_toggle:s0
 
 #FPC
 /sys/devices/platform/soc/soc:fpc1020(/.*?) u:object_r:vendor_sysfs_fps_attr:s0
@@ -186,6 +195,14 @@
 
 /sys/devices/platform/soc/1b46018.qfprom/qfprom0/nvmem                  u:object_r:vendor_sysfs_qfprom:s0
 
+#Vendor_hvdcp
+
+/sys/devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-00/1c40000.qcom,spmi:qcom,pm6125@0:vadc@3100/iio:device[0-9](/.*?)  u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/iio:device[0-9](/.*?) u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/iio:device[0-9](/.*?) u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:vadc@3100/iio:device[0-9](/.*?) u:object_r:vendor_sysfs_battery_supply:s0
+/sys/devices/platform/soc/4ac0000.qcom,qupv3_0_geni_se/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/iio:device[0-9](/.*?) u:object_r:vendor_sysfs_battery_supply:s0
+
 # Audio
 /dev/msm_audio_cal  u:object_r:vendor_audio_cal_device:s0
 #msm_lsm cdev
@@ -196,4 +213,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 c70dccb..e30cfa3 100644
--- a/qva/vendor/trinket/genfs_contexts
+++ b/qva/vendor/trinket/genfs_contexts
@@ -31,71 +31,71 @@
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
 #pmic sysfs_nodes
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,pm6125_rtc/rtc u:object_r:sysfs_rtc:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,pm6125_rtc/rtc u:object_r:sysfs_rtc:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/pc_port u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb u:object_r:vendor_sysfs_usb_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/main u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms u:object_r:vendor_sysfs_battery_supply:s0
 genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-0008/4a84000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
+genfscon sysfs /devices/platform/soc/4ac0000.qcom,qupv3_0_geni_se/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel u:object_r:vendor_sysfs_battery_supply:s0
 genfscon sysfs /class/qcom-battery u:object_r:vendor_sysfs_battery_supply:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/leds u:object_r:vendor_sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,leds@d300/leds u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,vibrator@5700/leds/vibrator u:object_r:sysfs_leds:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,leds@d000/leds u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,leds@d300/leds u:object_r:sysfs_leds:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-03/1c40000.qcom,spmi:qcom,pmi632@3:qcom,vibrator@5700/leds/vibrator u:object_r:sysfs_leds:s0
+genfscon sysfs /bus/iio/devices u:object_r:vendor_sysfs_battery_supply:s0
 
 # PMIC devices wakeup nodes
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,pm6125_rtc/rtc/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/pc_port/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/main/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,pm6125_rtc/rtc/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/main/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-0008/4a84000.i2c:qcom,smb1355@8:qcom,smb1355-charger@1000/power_supply/parallel/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,power-on@800/wakeup/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,power-on@800/wakeup/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/spmi0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/wakeup/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,power-on@800/wakeup/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,power-on@800/wakeup/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/wakeup/wakeup u:object_r:sysfs_wakeup:s0
 
 # wakeup nodes listed from SuspendSepolicyTests.sh
 genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,power-on@800/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,power-on@800/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/4ac0000.qcom,qupv3_0_geni_se/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel/wakeup12 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb/wakeup13 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/pc_port/wakeup14 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery/wakeup15 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/4ac0000.qcom,qupv3_0_geni_se/4a84000.i2c/i2c-0/0-000c/4a84000.i2c:qcom,smb1355@c:qcom,smb1355-charger@1000/power_supply/parallel/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/pc_port/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/4e00000.ssusb/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms/wakeup18 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/6080000.remoteproc-mss/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,pm6125_rtc/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/ab00000.remoteproc-adsp/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/b300000.remoteproc-cdsp/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/4ac0000.qcom,qupv3_0_geni_se/4a84000.i2c/i2c-0/0-0028/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/4ac0000.qcom,qupv3_0_geni_se/4a88000.i2c/i2c-1/1-0020/synaptics_tcm.0/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_aac/wakeup25 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_alac/wakeup26 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_amrnb/wakeup27 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_amrwb/wakeup28 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_amrwbplus/wakeup29 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_aac/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_alac/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_amrnb/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_amrwb/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_amrwbplus/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-00/1c40000.qcom,spmi:qcom,pm6125@0:qcom,pm6125_rtc/rtc/rtc0/alarmtimer.0.auto/wakeup u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_ape/wakeup30 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_evrc/wakeup31 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_g711alaw/wakeup32 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_g711mlaw/wakeup33 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_mp3/wakeup34 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_multi_aac/wakeup35 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_qcelp/wakeup36 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_wma/wakeup37 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/misc/msm_wmapro/wakeup38 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/fastrpc/adsprpc-smd/wakeup8 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/virtual/fastrpc/adsprpc-smd/wakeup9 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_ape/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_evrc/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_g711alaw/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_g711mlaw/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_mp3/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_multi_aac/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_qcelp/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_wma/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/misc/msm_wmapro/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/fastrpc/adsprpc-smd/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/5800000.qcom,ipa/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:gpio_keys/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/1610000.qcom,msm-eud/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,msm-audio-apr/soc:qcom,msm-audio-apr:qcom,q6core-audio/soc:qcom,msm-audio-apr:qcom,q6core-audio:bolero-cdc/tx-macro/tx_swr_ctrl/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,smp2p_sleepstate/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/4cc0000.qcom,qupv3_1_geni_se/4c90000.qcom,qup_uart/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/virtual/fastrpc/adsprpc-smd-secure/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@0/video4linux/video3/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@1/video4linux/video4/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@2/video4linux/video5/wakeup u:object_r:sysfs_wakeup:s0
 
 # USB device wakeup nodes
 genfscon sysfs /devices/platform/soc/4e00000.ssusb/wakeup/wakeup u:object_r:sysfs_wakeup:s0
@@ -117,6 +117,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
@@ -126,14 +127,27 @@
 genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-1/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
 genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/sde-crtc-0/fps_periodicity_ms u:object_r:vendor_sysfs_graphics:s0
 
+# Sysfs for graphics
+genfscon sysfs /devices/platform/soc/5900000.qcom,kgsl-3d0/kgsl/kgsl-3d0 u:object_r:vendor_sysfs_kgsl:s0
+genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/modes u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/status u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5e00000.qcom,mdss_rotator/video4linux/video2/name u:object_r:vendor_sysfs_graphics:s0
+
 #net sysfs
 genfscon sysfs /devices/platform/soc/c800000.qcom,icnss/net u:object_r:sysfs_net:s0
 
 #camera sysfs
-genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@0/video4linux/video2/name u:object_r:vendor_sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@1/video4linux/video3/name u:object_r:vendor_sysfs_graphics:s0
-genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@2/video4linux/video4/name u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@0/video4linux/video3/name u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@1/video4linux/video4/name u:object_r:vendor_sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/5c0c000.qcom,cci/5c0c000.qcom,cci:qcom,camera@2/video4linux/video5/name u:object_r:vendor_sysfs_graphics:s0
 
 #uevent sysfs
 genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/battery/uevent u:object_r:vendor_sysfs_uevent:s0
 genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qpnp,qg/power_supply/bms/uevent u:object_r:vendor_sysfs_uevent:s0
+genfscon sysfs /devices/platform/soc/1c40000.qcom,spmi/spmi-0/0-02/1c40000.qcom,spmi:qcom,pmi632@2:qcom,qpnp-smb5/power_supply/usb/uevent u:object_r:vendor_sysfs_uevent:s0
+
+# mmc sysfs
+genfscon sysfs /devices/virtual/bdi u:object_r:vendor_sysfs_mmc_host:s0
+genfscon sysfs /devices/platform/soc/4744000.sdhci/mmc_host/mmc0/mmc0:0001/block/mmcblk0/queue/read_ahead_kb u:object_r:vendor_sysfs_mmc_host:s0
+genfscon sysfs /devices/platform/soc/4744000.sdhci/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0boot0/queue/read_ahead_kb u:object_r:vendor_sysfs_mmc_host:s0
+genfscon sysfs /devices/platform/soc/4744000.sdhci/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0boot1/queue/read_ahead_kb u:object_r:vendor_sysfs_mmc_host:s0
diff --git a/qva/vendor/trinket/hal_graphics_allocator_default.te b/qva/vendor/trinket/hal_graphics_allocator_default.te
index fed16a3..5fbd8a8 100644
--- a/qva/vendor/trinket/hal_graphics_allocator_default.te
+++ b/qva/vendor/trinket/hal_graphics_allocator_default.te
@@ -1,6 +1,9 @@
-# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# Copyright (c) 2023,2024 Qualcomm Innovation Center, Inc. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
 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;
+allow hal_graphics_allocator_default vendor_dmabuf_secure_pixel:chr_file r_file_perms;
diff --git a/qva/vendor/trinket/hal_vibrator_default.te b/qva/vendor/trinket/hal_vibrator_default.te
deleted file mode 100644
index c62deed..0000000
--- a/qva/vendor/trinket/hal_vibrator_default.te
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-
-#hal_vibrator_default permission
-allow hal_vibrator_default vendor_qc_aon_prop:file { read };
diff --git a/qva/vendor/trinket/hvdcp.te b/qva/vendor/trinket/hvdcp.te
new file mode 100644
index 0000000..d2a3caf
--- /dev/null
+++ b/qva/vendor/trinket/hvdcp.te
@@ -0,0 +1,4 @@
+#Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+#SPDX-License-Identifier: BSD-3-Clause-Clear
+
+set_prop(vendor_hvdcp, ctl_stop_prop)
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 };
diff --git a/qva/vendor/trinket/property_contexts b/qva/vendor/trinket/property_contexts
new file mode 100644
index 0000000..ccb460c
--- /dev/null
+++ b/qva/vendor/trinket/property_contexts
@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+#mm-video
+persist.vendor.wfd.source.hdmi.enable        u:object_r:vendor_video_prop:s0
diff --git a/qva/vendor/trinket/vendor_hal_drm_widevine.te b/qva/vendor/trinket/vendor_hal_drm_widevine.te
new file mode 100644
index 0000000..321f02f
--- /dev/null
+++ b/qva/vendor/trinket/vendor_hal_drm_widevine.te
@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# widevine
+allow vendor_hal_drm_widevine vendor_dmabuf_qseecom_ta_heap_device:chr_file r_file_perms;