diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-08-10 11:15:16 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-08-10 11:15:16 -0700 |
| commit | fd44afebdcad9cfcaf4b29e979f1d6acc6c917f2 (patch) | |
| tree | 05fcdd928bf675083b34ec65486e95226d9a2054 /framework/java/android/bluetooth/BluetoothMap.java | |
| parent | 7b2835c88cb8d1733d60d7a558d80d9fc0d05150 (diff) | |
| parent | 7c361396d2c2fbf58423d45d5c54792a69bade75 (diff) | |
Merge 7c361396d2c2fbf58423d45d5c54792a69bade75 on remote branch
Change-Id: Ib46c197d57679181b505738ad576adf0779e68a0
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) { |