From d84805f1272679d3f9eccbf1aee14aa6019f20c3 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 31 Oct 2022 21:42:51 +0000 Subject: [PATCH 1/2] Revert "Disable Spatial Audio [ DO NOT MERGE ]" This reverts commit 1b4f1da3ca545a100215628cf970c1eddfced142. Reason for revert: disabling was temporary Change-Id: I19b0d64c061b73ec771f78ab1346ab397de5421a --- device-oriole.mk | 4 ++-- device-raven.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 37f49a0..812ce1a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -243,9 +243,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# declare use of spatial audio: disabled +# declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=false + ro.audio.spatializer_enabled=true PRODUCT_PACKAGES += \ libspatialaudio diff --git a/device-raven.mk b/device-raven.mk index 44a81eb..e97a150 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -256,9 +256,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# declare use of spatial audio: disabled +# declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=false + ro.audio.spatializer_enabled=true PRODUCT_PACKAGES += \ libspatialaudio From 501128c9d2c41768a7a813aac4b8bf4124d51296 Mon Sep 17 00:00:00 2001 From: kuanyuhuang Date: Fri, 28 Oct 2022 10:13:40 +0000 Subject: [PATCH 2/2] [resolve conflict] BT: add sysprop to enable OPUS codec am: 932c8178a7 am: 044b8c4e1d Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/20296724 Change-Id: I39f535bb13a9e4c9f48cd6f6db6373ddb9f50f55 Signed-off-by: Automerger Merge Worker --- device-oriole.mk | 1 - device-raven.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a034a01..c8be815 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -269,4 +269,3 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif - diff --git a/device-raven.mk b/device-raven.mk index b965539..d31a888 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -280,4 +280,3 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -