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

Commit 2cefde9f authored by Michał Narajowski's avatar Michał Narajowski Committed by Automerger Merge Worker
Browse files

Merge "Fix media playing on LeAudio->A2DP switch" am: 29e329cc am:... 

Merge "Fix media playing on LeAudio->A2DP switch" am: 29e329cc am: e2cc5964 am: a9c1fe98 am: 645112ef

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



Change-Id: I8906187243a0a7f6d3e1127d067f2c1f3ae67ffb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb1a2df3 645112ef

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+4 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,10 @@ class ActiveDeviceManager { 
                    if (DBG) {

                        Log.d(TAG, "set LE audio device active: " + device);

                    }

                    setLeAudioActiveDevice(device);

                    if (!setLeAudioActiveDevice(device)) {

                        return false;

                    }



                    if (!Utils.isDualModeAudioEnabled()) {

                        setA2dpActiveDevice(null, true);

                        setHfpActiveDevice(null);