diff options
| author | Neha Jain <jainne@google.com> | 2022-06-29 23:53:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-30 02:24:28 +0000 |
| commit | 856f6acf59076eb3b200b1581d178745c9f0e681 (patch) | |
| tree | 015aab1ce91e4148f0c851baa4681b01d9aea25c /framework/java/android/bluetooth/BluetoothMap.java | |
| parent | 4c024a2dee95a9c9f94e8c4616e6aa9cdb5aa2a5 (diff) | |
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
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothMap.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothMap.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/framework/java/android/bluetooth/BluetoothMap.java b/framework/java/android/bluetooth/BluetoothMap.java index a8b48348da..2d4bc568ca 100644 --- a/framework/java/android/bluetooth/BluetoothMap.java +++ b/framework/java/android/bluetooth/BluetoothMap.java @@ -154,7 +154,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getState(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -184,7 +184,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<BluetoothDevice> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getClient(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -214,7 +214,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isConnected(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -256,7 +256,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -312,7 +312,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -343,7 +343,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -393,7 +393,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { log("getConnectionState(" + pairQuery.second.getAnonymizedAddress() + ") uncached"); } - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); try { pairQuery.first .getConnectionState(pairQuery.second, mAttributionSource, recv); @@ -490,7 +490,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -546,7 +546,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { |