From daea5cd2facaa5fa83a339cb8751f8cfdc8a1556 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 28 May 2024 01:59:12 +0000 Subject: [PATCH 1/6] waves: correct config to fix wrong tuning - remove unused controls since the last version isn't expected multiple instance. Bug: 341323676 Test: manual test Signed-off-by: Jasmine Cha (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be9842b68e01735d96019ab8f214c8b43ee00b4d) Merged-In: I69e5f4125044c3a56e8f44f5bace7cca3d06717b Change-Id: I69e5f4125044c3a56e8f44f5bace7cca3d06717b --- 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 From 12a2aec7bdf7264214c9e1def74c68c8fa75b658 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 22:04:16 +0000 Subject: [PATCH 2/6] Update oriole SVN to 84 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3bebdc87659369986910fdbf8b46f5adb1ab2c52) Merged-In: Ia346c23d8446075d901cce4a08b7f7513ab3c496 Change-Id: Ia346c23d8446075d901cce4a08b7f7513ab3c496 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index f72aefe..0b74ed1 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=83 + ro.vendor.build.svn=84 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 245f5834b556c0fd542fa925df87b017774fb0a0 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:06:58 +0000 Subject: [PATCH 3/6] Update raven SVN to 84 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eb3b22d11c82114e188c6ef220d8dd7f791af947) Merged-In: I2b4b94a72115bc2a7f7200ce7469a74cc5bd7114 Change-Id: I2b4b94a72115bc2a7f7200ce7469a74cc5bd7114 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index a14a304..8382360 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -198,7 +198,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=83 + ro.vendor.build.svn=84 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From bfa4bc9b4d6ebbd673d3523cfde9de316423ad7f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:07:01 +0000 Subject: [PATCH 4/6] raviole: Use build_flags for SVN Flag: build.RELEASE_SVN_ORIOLE Flag: build.RELEASE_SVN_RAVEN Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8062fbd55b92f21bfae9671aa1e8e9a0c100780e) Merged-In: I60035ec95cf07e8e992981a61738aa6f0a6d22ef Change-Id: I60035ec95cf07e8e992981a61738aa6f0a6d22ef --- device-oriole.mk | 9 ++++++++- device-raven.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 0b74ed1..03a5834 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -193,8 +193,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_ORIOLE +TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 8382360..7af865f 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -197,8 +197,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_RAVEN +TARGET_SVN ?= $(RELEASE_SVN_RAVEN) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From fba5f0b2438798906e35a42da99ccf24dada2145 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:27:52 +0000 Subject: [PATCH 5/6] Update raven SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:14c718c22f457c542885edea58c248356b21885b) Merged-In: I5514206adfd5f86fe1807f09132d5d3e319d45b6 Change-Id: I5514206adfd5f86fe1807f09132d5d3e319d45b6 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 7af865f..03b3b44 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -201,7 +201,7 @@ ifdef RELEASE_SVN_RAVEN TARGET_SVN ?= $(RELEASE_SVN_RAVEN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \ From ac3a513033003ca1751d57394c61cb88f95f2403 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:15:18 +0000 Subject: [PATCH 6/6] Update oriole SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:419a9a7da3d3208145d728f18b4a4e200c9cd720) Merged-In: Iffe880b97e0296047b9e2b9c9929d67d09d257b6 Change-Id: Iffe880b97e0296047b9e2b9c9929d67d09d257b6 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 03a5834..7de385a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -197,7 +197,7 @@ ifdef RELEASE_SVN_ORIOLE TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \