diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 04:13:03 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 04:13:03 +0000 |
| commit | 94ea60dc13501b3a64093f3b975de395dcf96b85 (patch) | |
| tree | 3cc753e6115fae83b16d4c9468d5119aed64d696 /framework/java/android/bluetooth/BluetoothVolumeControl.java | |
| parent | f8b9ffa1b12db219685ae631d91b9020a030c63a (diff) | |
| parent | dd85e91cea26c7f706af36c852e79d5b4ca1f173 (diff) | |
Merge cherrypicks of [19114242] into tm-release.
Change-Id: I67377ee00eae39bd4676731556b42f1c4ffecf20
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothVolumeControl.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothVolumeControl.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/framework/java/android/bluetooth/BluetoothVolumeControl.java b/framework/java/android/bluetooth/BluetoothVolumeControl.java index d76a08686d..080b9a6d64 100644 --- a/framework/java/android/bluetooth/BluetoothVolumeControl.java +++ b/framework/java/android/bluetooth/BluetoothVolumeControl.java @@ -157,7 +157,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose final IBluetoothVolumeControl service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - SynchronousResultReceiver.get(); + new SynchronousResultReceiver(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -245,7 +245,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose } 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), @@ -276,7 +276,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose } 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), @@ -306,7 +306,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 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 | TimeoutException e) { @@ -355,7 +355,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose final IBluetoothVolumeControl service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - SynchronousResultReceiver.get(); + new SynchronousResultReceiver(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -406,7 +406,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose try { final IBluetoothVolumeControl service = getService(); if (service != null) { - final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); service.unregisterCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -442,7 +442,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); service.setVolumeOffset(device, volumeOffset, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -483,7 +483,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose final boolean defaultValue = false; try { - final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); service.isVolumeOffsetAvailable(device, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -523,7 +523,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose && (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 | TimeoutException e) { @@ -559,7 +559,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 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 | TimeoutException e) { |