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

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

Merge "le_audio: Don't expose already exposed LE Audio active device" am:... 

Merge "le_audio: Don't expose already exposed LE Audio active device" am: 28ef3338 am: 4c8ffe11 am: dad2afc2 am: 1ac370a7

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



Change-Id: I0d1ca9ff8180db5756440cd19509231b59e08e5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef267aa6 1ac370a7

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+7 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ public class LeAudioService extends ProfileService { 
    private HandlerThread mStateMachinesThread;

    private volatile BluetoothDevice mActiveAudioOutDevice;

    private volatile BluetoothDevice mActiveAudioInDevice;

    private BluetoothDevice mExposedActiveDevice;

    private LeAudioCodecConfig mLeAudioCodecConfig;

    private final Object mGroupLock = new Object();

    ServiceFactory mServiceFactory = new ServiceFactory();
@@ -1121,6 +1122,11 @@ public class LeAudioService extends ProfileService { 
                byte[] addressBytes = Utils.getBytesFromAddress(address);

                BluetoothDevice device = mAdapterService.getDeviceFromByte(addressBytes);



                /* Don't expose already exposed active device */

                if (device.equals(mExposedActiveDevice)) {

                    return;

                }



                if (DBG) {

                    Log.d(TAG, " onAudioDevicesAdded: " + device + ", device type: "

                            + deviceInfo.getType() + ", isSink: " + deviceInfo.isSink()
@@ -1135,6 +1141,7 @@ public class LeAudioService extends ProfileService { 
                    continue;

                }



                mExposedActiveDevice = device;

                notifyActiveDeviceChanged(device);

                return;

            }