From dc6ef9bb5aa4b43ef2724d1cba252c48dfbcb35a Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Thu, 24 Aug 2023 12:36:48 +0800 Subject: [PATCH 1/3] Jump SVN to 2 Test: adb shell getprop ro.vendor.build.svn Bug: 297279418 Change-Id: Ic2453f6c369a1e9b72da27737f80c875d6264bce --- device-husky.mk | 2 +- device-shiba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index bde5f0f..4456b14 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -321,7 +321,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-shiba.mk b/device-shiba.mk index 4462813..037ce7b 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -302,7 +302,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 9e502e7b418033ff9128750c708cfbddb437bb52 Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Thu, 24 Aug 2023 12:38:53 +0800 Subject: [PATCH 2/3] Jump SVN to 3 Test: adb shell getprop ro.vendor.build.svn Bug: 297279261 Change-Id: I8abbe4ae1161b8526c315bd47587d8d560aae04f --- device-husky.mk | 2 +- device-shiba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 4456b14..1869e21 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -321,7 +321,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-shiba.mk b/device-shiba.mk index 037ce7b..116b14e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -302,7 +302,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 10fa322cf5d18f52b6fb8c3866e379d95d878a6f Mon Sep 17 00:00:00 2001 From: Patty Huang Date: Thu, 24 Aug 2023 16:10:27 +0800 Subject: [PATCH 3/3] Apply the workaround for the CIS->SCO handover Set system property persist.bluetooth.leaudio.notify.idle.during.call to true to receive the notification when LeAudio group turned idle Bug: 297312397 Test: Switch LE Audio device to HFP device during phone call, and ensure the HFP device can hear sound and don't have buzzing sound. Change-Id: Id89c9325f5158113dd653d2267167d4d0e59c935 --- device-husky.mk | 5 +++++ device-ripcurrent.mk | 5 +++++ device-shiba.mk | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 052b4bb..478e570 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -196,6 +196,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# Bluetooth LE Audio CIS handover to SCO +# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index b74d75e..0965f4f 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -161,6 +161,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# Bluetooth LE Audio CIS handover to SCO +# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service diff --git a/device-shiba.mk b/device-shiba.mk index 185e0f8..1ee3e21 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -187,6 +187,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# Bluetooth LE Audio CIS handover to SCO +# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true