Revert "Revert "Reuse SynchronousResultReceivers instead of creating new.""

This reverts commit dd85e91cea26c7f706af36c852e79d5b4ca1f173.

Bug: 217366135
Reason for revert: Need this to fix a crash bug in tm-dev

Change-Id: I2a94c278edc0681c5b8af6ea0a0171b71d72c650
(cherry picked from commit dbaf406ccb0ed887d4e93057c9ec0d3457f14457)
Merged-In: I2a94c278edc0681c5b8af6ea0a0171b71d72c650

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);