From c4d47798ba3318d19975e7ba03545cedb9bcb331 Mon Sep 17 00:00:00 2001 From: Alice Wang Date: Tue, 21 May 2024 15:21:11 +0000 Subject: [PATCH 1/3] Disable AVF remote attestation on bluejay devices The VM DICE chain support required by AVF remote attestation is only introduced from Pixel 7. Bug: 341292601 Test: run VM remote attestation on Pixel 6 and check it is disabled Change-Id: I820fdd2b9d84986a30350606eca805668d007997 --- device-bluejay.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index da89a1e..a19829d 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -274,3 +274,6 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.oem_id=00e0 \ ro.quick_start.device_id=bluejay + +# Disable AVF Remote Attestation +PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true From a7b7acea91c09d5fb5cc8aab983c0b0e32ad4a35 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 28 May 2024 02:02:27 +0000 Subject: [PATCH 2/3] waves: correct config to fix wrong tuning - remove unused controls since the last version isn't expected multiple instance. Bug: 341323676 Test: manual test Change-Id: I3a3c91ec742a46169cab8c57d32b5faef49603c6 Signed-off-by: Jasmine Cha --- audio/bluejay/tuning/waves/waves_config.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/audio/bluejay/tuning/waves/waves_config.ini b/audio/bluejay/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/bluejay/tuning/waves/waves_config.ini +++ b/audio/bluejay/tuning/waves/waves_config.ini @@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER -HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## [HAL_SUPPORTED_CONTROLS] SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL -A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so From 46ea9b3a358f7704a8ed340bbd52855aff1242dc Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 29 May 2024 10:00:04 +0000 Subject: [PATCH 3/3] Switch makefile owners to MK_OWNERS Bug: 278167548 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bab86ac7deaae3497b3b75ef7d3d8976ff20894) Merged-In: I141c255cad00dd9dcd9c3491e5bd3b18a9c9fcfd Change-Id: I141c255cad00dd9dcd9c3491e5bd3b18a9c9fcfd --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 7eed0c3..5524a1f 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS