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

Commit c8b0c1c1 authored by Eric Shih's avatar Eric Shih
Browse files

Not to switch active device when broadcasting 

Follow up cl for aosp/3324694

Bug: 378613666
Test: atest BluetoothInstrumentationTests
Flag: Exempt, trivial and obvious fix.
Change-Id: Ib83985f58c24749b9f289184bae201519d012b54
parent 5a986e9d

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

                }