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

Commit 03fc6115 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "VolumeControl: Early return in unregisterCallback" into main am: 7ccc74f3 

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



Change-Id: Ia4533980dd8b8628bbd5443099bf4d488abd6e76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46ef4fea 7ccc74f3

framework/java/android/bluetooth/BluetoothVolumeControl.java

+15 −13
Original line number Diff line number Diff line
@@ -604,8 +604,11 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 
            }

        }



        if (!mCallbackExecutorMap.isEmpty()) {

            return;

        }



        // If the callback map is empty, we unregister the service-to-app callback

        if (mCallbackExecutorMap.isEmpty()) {

        try {

            final IBluetoothVolumeControl service = getService();

            if (service != null) {
@@ -620,7 +623,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 
            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        }

    }

    }



    /**

     * Tells the remote device to set a volume offset to the absolute volume.