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

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

Merge "Not to switch active device when broadcasting" into main am: bffb1134 am: 070d33ba 

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



Change-Id: I0df4d85303486c6e7b9ca87b4c2eb8913c0a0009
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b09a7217 070d33ba

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

+9 −3
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
                updateLeAudioActiveDeviceIfDualMode(mHfpActiveDevice, device);



                if (!Utils.isDualModeAudioEnabled() || device == null) {

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

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

                    synchronized (mLock) {

                        setFallbackDeviceActiveLocked(null);

                    }
@@ -815,8 +815,14 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
                mLeHearingAidActiveDevice = device;

            }



            if (device == null && !Utils.isDualModeAudioEnabled()) {

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

            // This covers the call audio routing case across classic BT and BLE.

            // Because there's only one active device at the same time. So if a device connect with

            // HFP & LE audio and when LE audio device is disconnected, we should fallback the

            // active device to the HFP.

            // LE case has isBroadcastingAudio which would set the active device to null when

            // broadcasting the audio. So we shouldn't try to change the active device in this case.

            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);

                }