commit 94e3a82a18470a9f0a94910cf86cc2989f91ba1c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 24 23:28:59 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 24 23:28:59 2023 +0000
tree 1ee1ef906dc9f0ee2f1153fbeed753512e3d753e
parent 1558ab550c620399d9000ba902db40c943826641
parent 1a5a5cb91d6eb67470a2401ee7a2501dad0da734

Merge "Catch IllegalStateException in Telecom when the Bluetooth process is down" into main

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 039b4df..e1c5625 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
@@ -104,9 +104,13 @@
                                 logString = "Got BluetoothLeAudio: "
                                         + mBluetoothLeAudioService;
                                 if (!mLeAudioCallbackRegistered) {
-                                    mBluetoothLeAudioService.registerCallback(
-                                                mExecutor, mLeAudioCallbacks);
-                                    mLeAudioCallbackRegistered = true;
+                                    try {
+                                        mBluetoothLeAudioService.registerCallback(
+                                                    mExecutor, mLeAudioCallbacks);
+                                        mLeAudioCallbackRegistered = true;
+                                    } catch (IllegalStateException e) {
+                                        logString += ", but Bluetooth is down";
+                                    }
                                 }
                             } else {
                                 logString = "Connected to non-requested bluetooth service." +