From 2ac50a14c1bce5bbe5ee8eb9db98f74c55f2cc6b Mon Sep 17 00:00:00 2001 From: Yiyi Shen Date: Mon, 10 Feb 2025 19:08:21 +0800 Subject: [PATCH] [Audiosharing] Set fallback group to -1 when routing to classic buds Bug: 385835055 Bug: 381946931 Test: manual Flag: com.android.settingslib.flags.adopt_primary_group_management_api Change-Id: I3f184c9af750221187917751e2cfdf50df112496 --- .../audiosharing/AudioSharingDialogHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java index 2a1f4da2cf8..655fd970a15 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java +++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java @@ -44,10 +44,12 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; +import com.android.settingslib.bluetooth.LeAudioProfile; import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.flags.Flags; import com.android.settingslib.utils.ThreadUtils; import com.google.common.collect.ImmutableList; @@ -225,6 +227,14 @@ public class AudioSharingDialogHandler { mLocalBtManager, groupedDevices, /* filterByInSharing= */ true); AudioSharingStopDialogFragment.DialogEventListener listener = () -> { + if (Flags.adoptPrimaryGroupManagementApi() && mLocalBtManager != null) { + LeAudioProfile profile = + mLocalBtManager.getProfileManager().getLeAudioProfile(); + if (profile != null) { + profile.setBroadcastToUnicastFallbackGroup( + BluetoothCsipSetCoordinator.GROUP_ID_INVALID); + } + } cachedDevice.setActive(); mIsStoppingBroadcast = true; AudioSharingUtils.stopBroadcasting(mLocalBtManager);