From 22efb793b7f40f1953a80ff10a81ee2709b1defb Mon Sep 17 00:00:00 2001 From: Vic Huang Date: Wed, 10 Jul 2024 08:20:00 +0000 Subject: [PATCH 1/2] Disable LE audio switcher in develop option Test: manually test pass Bug: 352241698 Flag: NONE Modify property to disable LE audio switcher Change-Id: I666ea8e21070eeda761263957db767eaa970a1b3 --- bluetooth/qti_default.mk | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 7d26e5f..f696ce1 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -23,38 +23,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_switcher.supported=true \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=false \ - ro.vendor.audio_hal.ble_use_stream_id=true \ - bluetooth.profile.bap.unicast.client.enabled?=true \ - bluetooth.profile.csip.set_coordinator.enabled?=true \ - bluetooth.profile.hap.client.enabled?=true \ - bluetooth.profile.mcp.server.enabled?=true \ - bluetooth.profile.ccp.server.enabled?=true \ - bluetooth.profile.vcp.controller.enabled?=true \ - -# Bluetooth LE Audio CIS handover to SCO -# Set the property only if the controller doesn't support CIS and SCO -# simultaneously. More details in b/242908683. -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.notify.idle.during.call=true - -# Not support LE Audio dual mic SWB call based on the current launch strategy -PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.leaudio.dual_bidirection_swb.supported=false - -# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default) -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.toggle_visible=false - -# LE Auido Offload Capabilities setting -PRODUCT_COPY_FILES += \ - device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml - -# LE Audio use classic connection by default -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio.le_audio_connection_by_default=false + ro.bluetooth.leaudio_switcher.supported=false \ + bluetooth.profile.bap.unicast.client.enabled?=false \ + bluetooth.profile.csip.set_coordinator.enabled?=false \ + bluetooth.profile.hap.client.enabled?=false \ + bluetooth.profile.mcp.server.enabled?=false \ + bluetooth.profile.ccp.server.enabled?=false \ + bluetooth.profile.vcp.controller.enabled?=false \ # Bluetotoh Auto On feature PRODUCT_PRODUCT_PROPERTIES += \ From a6d2650cbf619521a78364321a84489ec7acdae4 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:11:05 +0000 Subject: [PATCH 2/2] lynx: Use build_flags for SVN Flag: build.RELEASE_SVN_LYNX Bug: 332726030 Change-Id: Id2c31d9b6b8db9d7948a7a1174be141e3b913171 --- device-lynx.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 1509e75..1c36d85 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -223,8 +223,15 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g # Increment the SVN for any official public releases +ifdef RELEASE_SVN_LYNX +TARGET_SVN ?= $(RELEASE_SVN_LYNX) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 44 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \