diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 00:04:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 00:04:34 +0000 |
| commit | f8b9ffa1b12db219685ae631d91b9020a030c63a (patch) | |
| tree | 25129cf2994447be05b91ae875abcbbbcadc52fa /framework/java/android/bluetooth/le/BluetoothLeScanner.java | |
| parent | 5862deea655f581b07e9b7e073f5c459e1191017 (diff) | |
| parent | 655653f48f95b154bf405d122cc912e476bee0d5 (diff) | |
Merge cherrypicks of [19039092, 19068701, 19032880] into tm-release.
Change-Id: I1b0f0ec8220609517837acf8a68de53aabcfd226
Diffstat (limited to 'framework/java/android/bluetooth/le/BluetoothLeScanner.java')
| -rw-r--r-- | framework/java/android/bluetooth/le/BluetoothLeScanner.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java index f5f963e21d..28d408ec65 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java @@ -282,7 +282,7 @@ public final class BluetoothLeScanner { wrapper.startRegistration(); } else { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.startScanForIntent(callbackIntent, settings, filters, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -330,7 +330,7 @@ public final class BluetoothLeScanner { IBluetoothGatt gatt; try { gatt = mBluetoothManager.getBluetoothGatt(); - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.stopScanForIntent(callbackIntent, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -428,7 +428,7 @@ public final class BluetoothLeScanner { // Scan stopped. if (mScannerId == -1 || mScannerId == -2) return; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mBluetoothGatt.registerScanner(this, mWorkSource, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); wait(REGISTRATION_CALLBACK_TIMEOUT_MILLIS); @@ -460,11 +460,11 @@ public final class BluetoothLeScanner { return; } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mBluetoothGatt.stopScan(mScannerId, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); - final SynchronousResultReceiver recv2 = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv2 = SynchronousResultReceiver.get(); mBluetoothGatt.unregisterScanner(mScannerId, mAttributionSource, recv2); recv2.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -482,7 +482,7 @@ public final class BluetoothLeScanner { return; } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mBluetoothGatt.flushPendingBatchResults(mScannerId, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -501,7 +501,7 @@ public final class BluetoothLeScanner { synchronized (this) { if (status == BluetoothGatt.GATT_SUCCESS) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); if (mScannerId == -1) { // Registration succeeds after timeout, unregister scanner. mBluetoothGatt.unregisterScanner(scannerId, mAttributionSource, recv); |