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

Commit 845b15db authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch IllegalStateException in Telecom when the Bluetooth process is... 

Merge "Catch IllegalStateException in Telecom when the Bluetooth process is down" into main am: 94e3a82a am: 6edece55 am: 727341e6

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2668436



Change-Id: I8a5873c14b6a12988966d157ff0935a8693224be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba19e5ba 727341e6

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

+7 −3
Original line number Diff line number Diff line
@@ -104,9 +104,13 @@ public class BluetoothDeviceManager { 
                                logString = "Got BluetoothLeAudio: "

                                        + mBluetoothLeAudioService;

                                if (!mLeAudioCallbackRegistered) {

                                    try {

                                        mBluetoothLeAudioService.registerCallback(

                                                    mExecutor, mLeAudioCallbacks);

                                        mLeAudioCallbackRegistered = true;

                                    } catch (IllegalStateException e) {

                                        logString += ", but Bluetooth is down";

                                    }

                                }

                            } else {

                                logString = "Connected to non-requested bluetooth service." +