summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
author Yiyi Shen <yiyishen@google.com> 2025-03-20 07:33:08 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-20 07:33:08 -0700
commit337a5d366827e19e3d9ef339636452b5b8eca43c (patch)
tree10aca4a88fe02578ef3813168fddbef41f78cfc6 /packages/SettingsLib/src
parente2b73a039a24072dc44f1832df3bcf5f4f17dd0a (diff)
parent11a0ee96606234ece4ca046a92b38207d1046148 (diff)
Merge "[Audiosharing] Remove source for sinks disconnected/unpaired from Settings" into main
Diffstat (limited to 'packages/SettingsLib/src')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java34
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index e81c8220d707..78b307e7b816 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -25,6 +25,7 @@ import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothCsipSetCoordinator;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHearingAid;
+import android.bluetooth.BluetoothLeBroadcastReceiveState;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
import android.content.Context;
@@ -58,6 +59,7 @@ import com.android.settingslib.flags.Flags;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.widget.AdaptiveOutlineDrawable;
+import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -397,6 +399,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
}
Log.d(TAG, "Disconnect " + this);
+ if (Flags.enableLeAudioSharing()) {
+ removeBroadcastSource(ImmutableSet.of(mDevice));
+ }
mDevice.disconnect();
}
// Disconnect PBAP server in case its connected
@@ -609,6 +614,16 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
final BluetoothDevice dev = mDevice;
if (dev != null) {
mUnpairing = true;
+ if (Flags.enableLeAudioSharing()) {
+ Set<BluetoothDevice> devicesToRemoveSource = new HashSet<>();
+ devicesToRemoveSource.add(dev);
+ if (getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+ for (CachedBluetoothDevice member : getMemberDevice()) {
+ devicesToRemoveSource.add(member.getDevice());
+ }
+ }
+ removeBroadcastSource(devicesToRemoveSource);
+ }
final boolean successful = dev.removeBond();
if (successful) {
releaseLruCache();
@@ -623,6 +638,25 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
}
+ @WorkerThread
+ private void removeBroadcastSource(Set<BluetoothDevice> devices) {
+ if (mProfileManager == null || devices.isEmpty()) return;
+ LocalBluetoothLeBroadcast broadcast = mProfileManager.getLeAudioBroadcastProfile();
+ LocalBluetoothLeBroadcastAssistant assistant =
+ mProfileManager.getLeAudioBroadcastAssistantProfile();
+ if (broadcast != null && assistant != null && broadcast.isEnabled(null)) {
+ for (BluetoothDevice device : devices) {
+ for (BluetoothLeBroadcastReceiveState state : assistant.getAllSources(device)) {
+ if (BluetoothUtils.D) {
+ Log.d(TAG, "Remove broadcast source " + state.getBroadcastId()
+ + " from device " + device.getAnonymizedAddress());
+ }
+ assistant.removeSource(device, state.getSourceId());
+ }
+ }
+ }
+ }
+
public int getProfileConnectionState(LocalBluetoothProfile profile) {
return profile != null
? profile.getConnectionStatus(mDevice)