Merge 6feb94e0d3720232bede0e4d17c438f826a86e4d on remote branch
Change-Id: Ie0a9ec4b4fd2a6286e8e5b16887369fd290dd6ef
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/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/kona/hal_vibrator_default.te b/qva/vendor/kona/hal_vibrator_default.te
deleted file mode 100644
index 63bf8e1..0000000
--- a/qva/vendor/kona/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
-get_prop(hal_vibrator_default, vendor_qc_aon_prop)
diff --git a/qva/vendor/trinket/hal_graphics_allocator_default.te b/qva/vendor/trinket/hal_graphics_allocator_default.te
index b84b877..5fbd8a8 100644
--- a/qva/vendor/trinket/hal_graphics_allocator_default.te
+++ b/qva/vendor/trinket/hal_graphics_allocator_default.te
@@ -1,4 +1,4 @@
-# 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;
@@ -6,3 +6,4 @@
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 };