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

Commit 84e83e47 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "VolumeControl: Stop using List for unique callback" into main am: 373cad95 

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



Change-Id: Ic32e8846b88baf235bf55394997e10b311bdcc38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 162208fb 373cad95

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+31 −66
Original line number Diff line number Diff line
@@ -710,23 +710,6 @@ public class VolumeControlService extends ProfileService { 
    void notifyNewCallbackOfKnownVolumeInfo(IBluetoothVolumeControlCallback callback) {

        Log.d(TAG, "notifyNewCallbackOfKnownVolumeInfo");



        RemoteCallbackList<IBluetoothVolumeControlCallback> tempCallbackList =

                new RemoteCallbackList<>();

        if (tempCallbackList == null) {

            Log.w(TAG, "notifyNewCallbackOfKnownVolumeInfo: tempCallbackList not available");

            return;

        }



        /* Register callback on temporary list just to execute it now. */

        tempCallbackList.register(callback);



        int n = tempCallbackList.beginBroadcast();

        if (n != 1) {

            /* There should be only one calback in this place. */

            Log.e(TAG, "notifyNewCallbackOfKnownVolumeInfo: Shall be 1 but it is " + n);

        }



        for (int i = 0; i < n; i++) {

        // notify volume offset

        for (Map.Entry<BluetoothDevice, VolumeControlOffsetDescriptor> entry :

                mAudioOffsets.entrySet()) {
@@ -740,53 +723,35 @@ public class VolumeControlService extends ProfileService { 


                Log.d(

                        TAG,

                            "notifyNewCallbackOfKnownVolumeInfo, device: "

                                    + device

                                    + ", id: "

                                    + id

                                    + ", offset: "

                                    + offset

                                    + ", location: "

                                    + location

                                    + ", description: "

                                    + description);



                        "notifyNewCallbackOfKnownVolumeInfo,"

                                + (" device: " + device)

                                + (", id: " + id)

                                + (", offset: " + offset)

                                + (", location: " + location)

                                + (", description: " + description));

                try {

                        tempCallbackList

                                .getBroadcastItem(i)

                                .onVolumeOffsetChanged(device, id, offset);

                    } catch (RemoteException e) {

                        // Not every callback had to be defined; just continue

                    }

                    callback.onVolumeOffsetChanged(device, id, offset);

                    if (Flags.leaudioMultipleVocsInstancesApi()) {

                        try {

                            tempCallbackList

                                    .getBroadcastItem(i)

                                    .onVolumeOffsetAudioLocationChanged(device, id, location);

                        } catch (RemoteException e) {

                            // Not every callback had to be defined; just continue

                        callback.onVolumeOffsetAudioLocationChanged(device, id, location);

                        callback.onVolumeOffsetAudioDescriptionChanged(device, id, description);

                    }

                        try {

                            tempCallbackList

                                    .getBroadcastItem(i)

                                    .onVolumeOffsetAudioDescriptionChanged(device, id, description);

                } catch (RemoteException e) {

                            // Not every callback had to be defined; just continue

                        }

                    }

                    // Dead client -- continue

                }

            }

        }



        tempCallbackList.finishBroadcast();



        if (Flags.leaudioBroadcastVolumeControlForConnectedDevices()) {

            notifyDevicesVolumeChanged(tempCallbackList, getDevices(), Optional.empty());

        }

            // using tempCallbackList is a hack to keep using 'notifyDevicesVolumeChanged'

            // without making any extra modification

            RemoteCallbackList<IBluetoothVolumeControlCallback> tempCallbackList =

                    new RemoteCallbackList<>();



        /* User is notified, remove callback from temporary list */

            tempCallbackList.register(callback);

            notifyDevicesVolumeChanged(tempCallbackList, getDevices(), Optional.empty());

            tempCallbackList.unregister(callback);

        }

    }



    void registerCallback(IBluetoothVolumeControlCallback callback) {

        Log.d(TAG, "registerCallback: " + callback);