commit ec8384e3609af12c1c076083a69559fed3eb4dcb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 21 16:24:51 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 21 16:24:51 2022 +0000
tree 452228434b13f6e0d0337182cfbfc633b4c7e9c0
parent b0cf588d2ad8a1521cd2149ef03a68fc631e1c8b
parent ad6fdf55833870df97da23ad7a3ba54c7c59154d

Merge "cleanupOrphanPA's feature (1/2)*"

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

diff --git a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
index dc8fbd8..58c74fc 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
@@ -420,10 +420,9 @@
         if (!mLeAudioSetAsCommunicationDevice) {
             return;
         }
-
+        mLeAudioSetAsCommunicationDevice = false;
         if (mAudioManager == null) {
             Log.i(this, "clearLeAudioCommunicationDevice: mAudioManager is null");
-            mLeAudioSetAsCommunicationDevice = false;
             return;
         }
         if (mAudioManager.getCommunicationDevice() != null
@@ -432,24 +431,22 @@
             mBluetoothRouteManager.onAudioLost(mAudioManager.getCommunicationDevice().getAddress());
             mAudioManager.clearCommunicationDevice();
         }
-        mLeAudioSetAsCommunicationDevice = false;
     }
 
     public void clearHearingAidCommunicationDevice() {
         if (!mHearingAidSetAsCommunicationDevice) {
             return;
         }
-
+        mHearingAidSetAsCommunicationDevice = false;
         if (mAudioManager == null) {
             Log.i(this, "clearHearingAidCommunicationDevice: mAudioManager is null");
-            mHearingAidSetAsCommunicationDevice = false;
+            return;
         }
         if (mAudioManager.getCommunicationDevice() != null
                 && mAudioManager.getCommunicationDevice().getType()
                 == AudioDeviceInfo.TYPE_HEARING_AID) {
             mAudioManager.clearCommunicationDevice();
         }
-        mHearingAidSetAsCommunicationDevice = false;
     }
 
     public boolean setLeAudioCommunicationDevice() {