commit 157fb2011f4c8343de4275e7ddccb802fdf61c8e
author Rongxuan Liu <rongxuan@google.com> Mon Dec 02 18:55:07 2024 +0000
committer Rongxuan Liu <rongxuan@google.com> Mon Dec 02 19:19:35 2024 +0000
tree 6edba27f59a230a361a3d29c7bc52e0b683db237
parent 35af90a3793511823648d27f39903234a1797265

[le audio] Null check when setting le audio active device

Bug: 381557098
Flag: EXEMPT, null check
Test: atest ActiveDeviceManagerTest
Change-Id: Ic0a8eab6d3e8a7369689fb063a75c38349b3de0e

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

diff --git a/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java b/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
index 9d744db..c738e3d 100644
--- a/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
+++ b/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
@@ -412,7 +412,7 @@
                 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 {