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

Commit 530789cd authored by Thomas Girardier's avatar Thomas Girardier Committed by Automerger Merge Worker
Browse files

Merge "ADM: fix switching between LEA and ASHA on same device" into main am: 077b456a 

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



Change-Id: I86dd6fa69c1fe38cf1fa6eecbefe0676e382bb51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45f6b3ca 077b456a

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

+2 −2
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
                if ((!Utils.isDualModeAudioEnabled() && device == null)) {

                    Log.d(TAG, "HFP active device is null. Try to fallback to the active device.");

                    synchronized (mLock) {

                        setFallbackDeviceActiveLocked(null);

                        setFallbackDeviceActiveLocked(mHfpActiveDevice /* recentlyRemovedDevice */);

                    }

                }

            }
@@ -831,7 +831,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
            if (device == null && !Utils.isDualModeAudioEnabled() && !isBroadcastingAudio()) {

                Log.d(TAG, "LE audio active device is null. Try to fallback to the active device.");

                synchronized (mLock) {

                    setFallbackDeviceActiveLocked(device);

                    setFallbackDeviceActiveLocked(mLeAudioActiveDevice /* recentlyRemovedDevice */);

                }

            }