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

Commit 09bdd9c2 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix weird race condition in BT manager" 

am: 53b8be09

Change-Id: I97093c0a6db50bc0160ac8d43d7fe10eb852c35b
parents 809f4336 53b8be09

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

+3 −2
Original line number Diff line number Diff line
@@ -123,8 +123,9 @@ public class BluetoothRouteManager extends StateMachine { 
            BluetoothDevice erroneouslyConnectedDevice = getBluetoothAudioConnectedDevice();

            if (erroneouslyConnectedDevice != null) {

                Log.w(LOG_TAG, "Entering AudioOff state but device %s appears to be connected. " +

                        "Disconnecting.", erroneouslyConnectedDevice);

                disconnectAudio();

                        "Switching to audio-on state for %s", erroneouslyConnectedDevice);

                // change this to just transition to the new audio on state

                transitionToActualState();

            }

            cleanupStatesForDisconnectedDevices();

            if (mListener != null) {