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

Commit 9622a81a authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge "BluetoothHearingAid: Rename result to defaultValue" into main

parents 3dee6073 db135d5f

framework/java/android/bluetooth/BluetoothHearingAid.java

+3 −3
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
            Log.d(TAG, "getAdvertisementServiceData()");

        }

        final IBluetoothHearingAid service = getService();

        AdvertisementServiceData result = null;

        final AdvertisementServiceData defaultValue = null;

        if (service == null || !isEnabled() || !isValidDevice(device)) {

            Log.w(TAG, "Proxy not attached to service");

            if (DBG) {
@@ -923,12 +923,12 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
                final SynchronousResultReceiver<AdvertisementServiceData> recv =

                        SynchronousResultReceiver.get();

                service.getAdvertisementServiceData(device, mAttributionSource, recv);

                result = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);

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

            } catch (RemoteException | TimeoutException e) {

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

            }

        }

        return result;

        return defaultValue;

    }



    /**