From c88d336b4d85a070c25cda24f5337b5d95eace50 Mon Sep 17 00:00:00 2001 From: Alice Wang Date: Tue, 21 May 2024 15:17:46 +0000 Subject: [PATCH 1/3] Disable AVF remote attestation on raviole 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: I20d25c59825eee77bffc9201e8751c0354c43f3a --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ device-slider.mk | 2 ++ device-whitefin.mk | 2 ++ 4 files changed, 10 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 6044ec6..bba4d97 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -308,3 +308,6 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.oem_id=00e0 \ ro.quick_start.device_id=oriole + +# Disable AVF Remote Attestation +PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true diff --git a/device-raven.mk b/device-raven.mk index 1549d07..815da0a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -318,3 +318,6 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.oem_id=00e0 \ ro.quick_start.device_id=raven + +# Disable AVF Remote Attestation +PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true diff --git a/device-slider.mk b/device-slider.mk index 75287bc..100a715 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -137,3 +137,5 @@ else device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif +# Disable AVF Remote Attestation +PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true diff --git a/device-whitefin.mk b/device-whitefin.mk index 0e03ece..41197dd 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -120,3 +120,5 @@ else device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif +# Disable AVF Remote Attestation +PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true From 35d0d9daef9df35d8a3dabe8e4858239e6e0309c Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 29 May 2024 10:00:38 +0000 Subject: [PATCH 2/3] Switch makefile owners to MK_OWNERS Bug: 278167548 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a0d6580902d9112812e298b40c4fed734698b114) Merged-In: Iedd4b8df3b6e9491e6b669ebb0010c5e120ba9d7 Change-Id: Iedd4b8df3b6e9491e6b669ebb0010c5e120ba9d7 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index e434a1c..f5be82c 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 From be9842b68e01735d96019ab8f214c8b43ee00b4d Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 28 May 2024 01:59:12 +0000 Subject: [PATCH 3/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: I69e5f4125044c3a56e8f44f5bace7cca3d06717b Signed-off-by: Jasmine Cha --- audio/oriole/tuning/waves/waves_config.ini | 3 --- audio/raven/tuning/waves/waves_config.ini | 3 --- 2 files changed, 6 deletions(-) diff --git a/audio/oriole/tuning/waves/waves_config.ini b/audio/oriole/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/oriole/tuning/waves/waves_config.ini +++ b/audio/oriole/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 diff --git a/audio/raven/tuning/waves/waves_config.ini b/audio/raven/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/raven/tuning/waves/waves_config.ini +++ b/audio/raven/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