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

Commit 5486a368 authored by Thomas Girardier's avatar Thomas Girardier Committed by Automerger Merge Worker
Browse files

Merge "[le audio] Null check when setting le audio active device" into main... 

Merge "[le audio] Null check when setting le audio active device" into main am: b3fdf4b1 am: df9979d4

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



Change-Id: I2a8330d6ab69bdd7387202b0b69c57eaaec25048
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f154d71a df9979d4

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

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
                final LeAudioService leAudioService = mFactory.getLeAudioService();

                setA2dpActiveDevice(null, true);

                setHfpActiveDevice(null);

                if (Flags.admVerifyActiveFallbackDevice()) {

                if (Flags.admVerifyActiveFallbackDevice() && leAudioService != null) {

                    setLeAudioActiveDevice(

                            null, !leAudioService.getActiveDevices().contains(device));

                } else {