diff options
| author | Neha Jain <jainne@google.com> | 2022-06-29 04:04:16 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 04:13:00 +0000 |
| commit | dd85e91cea26c7f706af36c852e79d5b4ca1f173 (patch) | |
| tree | 3cc753e6115fae83b16d4c9468d5119aed64d696 /framework/java/android/bluetooth/BluetoothPbapClient.java | |
| parent | f8b9ffa1b12db219685ae631d91b9020a030c63a (diff) | |
Revert "Reuse SynchronousResultReceivers instead of creating new."
This reverts commit 02dcbe72b3564559eaa9c2e2714824e4aac6f18c.
Reason for revert: Causing builds to fail b/237471430
Change-Id: I6165d838abf312085050359377f67a68a5f8b51a
(cherry picked from commit f5dd42bbd05e68f7763ccaa9fae5642acc4ceba1)
Merged-In: I6165d838abf312085050359377f67a68a5f8b51a
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothPbapClient.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothPbapClient.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/java/android/bluetooth/BluetoothPbapClient.java b/framework/java/android/bluetooth/BluetoothPbapClient.java index 1a29cea046..e10f5e5e49 100644 --- a/framework/java/android/bluetooth/BluetoothPbapClient.java +++ b/framework/java/android/bluetooth/BluetoothPbapClient.java @@ -172,7 +172,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -206,7 +206,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); service.disconnect(device, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); return true; @@ -240,7 +240,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - SynchronousResultReceiver.get(); + new SynchronousResultReceiver(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -279,7 +279,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - SynchronousResultReceiver.get(); + new SynchronousResultReceiver(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -316,7 +316,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -394,7 +394,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -455,7 +455,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { |