From 2e1b99cdd2412fd640d232f4e6a2984b5a9e5833 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 28 May 2024 02:02:27 +0000 Subject: [PATCH 1/4] 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:a7b7acea91c09d5fb5cc8aab983c0b0e32ad4a35) Merged-In: I3a3c91ec742a46169cab8c57d32b5faef49603c6 Change-Id: I3a3c91ec742a46169cab8c57d32b5faef49603c6 --- 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 161d763948d935088f29c950a8faf1e27051b6bb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:36:43 +0000 Subject: [PATCH 2/4] Update bluejay SVN to 63 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1cefe6d3ef02dfda675b875bae37f34a146e8629) Merged-In: Idce05f44e685a6558c84e73bb514ce509051d099 Change-Id: Idce05f44e685a6558c84e73bb514ce509051d099 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 2636f8d..04bae31 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -130,7 +130,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=62 + ro.vendor.build.svn=63 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From d1321b444eff67d5fc3cf5ae3e493c5173186e04 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 3 Apr 2024 20:55:15 +0000 Subject: [PATCH 3/4] bluejay: Use build_flags for SVN Flag: build.RELEASE_SVN_BLUEJAY Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bb1e8b00a9540edaa3d898dbdd341ddf19c7d7b) Merged-In: Icd47852ca9d8cc84c4dca145197eab0e671b596c Change-Id: Icd47852ca9d8cc84c4dca145197eab0e671b596c --- device-bluejay.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 04bae31..df1f009 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -129,8 +129,15 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/bluejay # Increment the SVN for any official public releases +ifdef RELEASE_SVN_BLUEJAY +TARGET_SVN ?= $(RELEASE_SVN_BLUEJAY) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 63 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=$(TARGET_SVN) # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 6eaf070be5b8f7043340f387d9dce84ec34d779b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 13 Jul 2024 00:31:42 +0000 Subject: [PATCH 4/4] Update bluejay SVN to 64 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:02d55c9d682282ed368e86f2c10064523780733d) Merged-In: Idcef1730cec758e776380497d78321cceca300bb Change-Id: Idcef1730cec758e776380497d78321cceca300bb --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index df1f009..f5ee9ac 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -133,7 +133,7 @@ ifdef RELEASE_SVN_BLUEJAY TARGET_SVN ?= $(RELEASE_SVN_BLUEJAY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 63 +TARGET_SVN ?= 64 endif PRODUCT_VENDOR_PROPERTIES += \