summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothManager.java
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-30 02:26:59 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-30 02:26:59 +0000
commit1eb35585122a52d9ab3e49817ef8632d1eea5536 (patch)
tree015aab1ce91e4148f0c851baa4681b01d9aea25c /framework/java/android/bluetooth/BluetoothManager.java
parent94ea60dc13501b3a64093f3b975de395dcf96b85 (diff)
parent856f6acf59076eb3b200b1581d178745c9f0e681 (diff)
Merge cherrypicks of [19093297, 19123578] into tm-release.
Change-Id: I649056e59cadef49a3509ec045a302c7bc363a85
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothManager.java b/framework/java/android/bluetooth/BluetoothManager.java
index 7ab32f3dfb..3fcb58a21a 100644
--- a/framework/java/android/bluetooth/BluetoothManager.java
+++ b/framework/java/android/bluetooth/BluetoothManager.java
@@ -172,7 +172,7 @@ public final class BluetoothManager {
IBluetoothGatt iGatt = managerService.getBluetoothGatt();
if (iGatt == null) return devices;
final SynchronousResultReceiver<List<BluetoothDevice>> recv =
- new SynchronousResultReceiver();
+ SynchronousResultReceiver.get();
iGatt.getDevicesMatchingConnectionStates(states, mAttributionSource, recv);
devices = Attributable.setAttributionSource(
recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(devices),