summaryrefslogtreecommitdiff
path: root/framework/java
diff options
context:
space:
mode:
author Rongxuan Liu <rongxuan@google.com> 2025-02-13 09:52:26 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-02-13 09:52:26 -0800
commit07177941d40f0426f7a102ba9507e2490f1f4bbb (patch)
treea52c275e663b43006abe9ce397cfa30366da561a /framework/java
parent8e33a4e7b454d22e5c906a245c433f522e6bc98e (diff)
parentc8cd800c325909cc9a332add6a3a4542c67ba186 (diff)
Merge changes Ia1574315,I40af88db,I1a3dc7d4,I5fa11c21,Ia6130c1c, ... into main
* changes: Bass: Refactor to simplify structure and reduce nesting Bass: Prevent add/resume source from interruption by start/stop searching Bass: Add getters for broadcast ID/publicData/Name from scan record Bass: Remove mPendingSourcesToAdd when remote is disconnected Bass: Remain sync if sink is waiting for PAST Bass: Add PENDING_SYNC_HANDLE to give clear information what it is Bass: Refactor handling select source requests Bass: Use source ID from sink instead of provided data in modify source Bass: Remove sink broadcast metadata in source switch during suspend Bass: Remove sink broadcast metadata in remove source after disconnect Bass: Remove sink broadcast metadata in sink disconnection Bass: Unit test for remove sink broadcast metadata in remove source
Diffstat (limited to 'framework/java')
-rw-r--r--framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java b/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java
index 683a5433ac..d8a5b4080e 100644
--- a/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java
+++ b/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java
@@ -916,7 +916,7 @@ public final class BluetoothLeBroadcastAssistant implements BluetoothProfile, Au
@RequiresBluetoothScanPermission
@RequiresPermission(allOf = {BLUETOOTH_SCAN, BLUETOOTH_PRIVILEGED})
public boolean isSearchInProgress() {
- log("stopSearchingForSources:");
+ log("isSearchInProgress:");
final IBluetoothLeBroadcastAssistant service = getService();
final boolean defaultValue = false;
if (service == null) {