commit 10b45563aacf1a0eb7c6be5deac84d325c70dd0a
author Sungsoo Lim <sungsoo@google.com> Wed Oct 26 00:15:24 2022 +0000
committer Sungsoo Lim <sungsoo@google.com> Wed Oct 26 00:17:53 2022 +0000
tree 94adabe5ca14af324890fcf5abf3668f90559285
parent 5457ff2c717e564a3d4af7594b7546203a3241c7

Handle missing variables when ActiveDeviceManager.clear()

Bug: 243053736
Tag: #refactor
Test: atest BluetoothInstrumentationTests:ActiveDeviceManagerTest
Change-Id: I235e39b23b950e007e8fdb1b9f6c4ea0eb0fda3c

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 c4be364..73dc4d2 100644
--- a/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
+++ b/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
@@ -821,8 +821,14 @@
         mHfpConnectedDevices.clear();
         mHfpActiveDevice = null;
 
+        mHearingAidConnectedDevices.clear();
         mHearingAidActiveDevice = null;
+
+        mLeAudioConnectedDevices.clear();
         mLeAudioActiveDevice = null;
+
+        mLeHearingAidConnectedDevices.clear();
+        mLeHearingAidActiveDevice = null;
     }
 
     @VisibleForTesting