Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9d096e6 authored by Angela Wang's avatar Angela Wang Committed by Automerger Merge Worker
Browse files

Merge "BluetoothVolumeControl: isVolumeOffsetAvailable() return wrong value"... 

Merge "BluetoothVolumeControl: isVolumeOffsetAvailable() return wrong value" into main am: f80e27b9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2943847



Change-Id: Ifdb7ec037c86e8733535a89cb5fa1f9c635ef107
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d83e811e f80e27b9

framework/java/android/bluetooth/BluetoothVolumeControl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -539,9 +539,9 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 




        final boolean defaultValue = false;

        final boolean defaultValue = false;

        try {

        try {

            final SynchronousResultReceiver recv = SynchronousResultReceiver.get();

            final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

            service.isVolumeOffsetAvailable(device, mAttributionSource, recv);

            service.isVolumeOffsetAvailable(device, mAttributionSource, recv);

            recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

        } catch (RemoteException | TimeoutException e) {

        } catch (RemoteException | TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        }

        }