From 2a7b2bd35b6c441900a3b9d123a8ee4a66f21cd6 Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 24 Apr 2024 05:02:01 +0800 Subject: [PATCH 1/2] audio: pack AIDL haptic gen effect into the image Bug: 330686268 Test: mm; haptic playground Change-Id: I629ebaf0c8aa1c6b92dce781cb9e1416094a8c67 --- audio/aidl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/audio/aidl.mk b/audio/aidl.mk index b8fd96b..e06ac0b 100644 --- a/audio/aidl.mk +++ b/audio/aidl.mk @@ -6,9 +6,6 @@ PRODUCT_PACKAGES += \ android.hardware.audio.service-aidl.aoc \ vendor.google.whitechapel.audio.hal.parserservice \ -# AIDL software effects. These are the effects supporting in all projects. -# For the project-specific effects, such as haptic generator, please add them -# to makefile in the project's device folder. PRODUCT_PACKAGES += \ libvisualizeraidl \ libbundleaidl \ @@ -16,6 +13,7 @@ PRODUCT_PACKAGES += \ libdynamicsprocessingaidl \ libloudnessenhanceraidl \ libdownmixaidl \ + libhapticgeneratoraidl \ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/aidl BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio From feb41bd23d650bd908d366ba9bc33a84801584a8 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Thu, 2 May 2024 16:28:07 +0000 Subject: [PATCH 2/2] Revert "sepolicy: Allow PixelGnss implement PPS function" Revert submission 27007604-pps_topic Reason for revert: Droid-monitor created revert due to breakages in b/338407263. Will be verifying through ABTD before submission. Reverted changes: /q/submissionid:27007604-pps_topic Change-Id: Icf89f2bd526634daa8ba10f80471b80dab0837f7 --- gps/lsi/sepolicy/hal_gnss_default.te | 3 --- gps/pixel/sepolicy/hal_gnss_pixel.te | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/gps/lsi/sepolicy/hal_gnss_default.te b/gps/lsi/sepolicy/hal_gnss_default.te index 0294a93..7d363f0 100644 --- a/gps/lsi/sepolicy/hal_gnss_default.te +++ b/gps/lsi/sepolicy/hal_gnss_default.te @@ -11,6 +11,3 @@ get_prop(hal_gnss_default, vendor_gps_prop) #IPC between pixel and vendor HAL binder_call(hal_gnss_default, hal_gnss_pixel) - -# Allow connect to gnss service -allow hal_gnss_default vendor_gps_file:fifo_file create_file_perms; diff --git a/gps/pixel/sepolicy/hal_gnss_pixel.te b/gps/pixel/sepolicy/hal_gnss_pixel.te index 9a0b648..512ecc9 100644 --- a/gps/pixel/sepolicy/hal_gnss_pixel.te +++ b/gps/pixel/sepolicy/hal_gnss_pixel.te @@ -12,15 +12,3 @@ allow hal_gnss_pixel sysfs_modem_state:file r_file_perms; #Toggle coredump node allow hal_gnss_pixel sysfs_gps:file rw_file_perms; - -# Allow access to CHRE multiclient HAL. -get_prop(hal_gnss_pixel, vendor_chre_hal_prop) - -# Allow binder to CHRE. -binder_call(hal_gnss_pixel, hal_contexthub_default) -allow hal_gnss_pixel hal_contexthub_service:service_manager find; - -# Allow connect to gnss service -allow hal_gnss_pixel vendor_gps_file:dir create_dir_perms; -allow hal_gnss_pixel vendor_gps_file:fifo_file create_file_perms; -