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

Commit 20b65a22 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix semantics of a null address with BT_AUDIO_LOST" 

am: d1dd9399

Change-Id: Id5547a43cffaea6dabd5bb72211f1f2fb4b80ce6
parents c3618957 d1dd9399

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

+2 −2
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ public class BluetoothRouteManager extends StateMachine { 
                        }

                        break;

                    case BT_AUDIO_LOST:

                        if (Objects.equals(mDeviceAddress, address)) {

                        if (Objects.equals(mDeviceAddress, address) || address == null) {

                            Log.i(LOG_TAG, "Connection with device %s failed.",

                                    mDeviceAddress);

                            transitionToActualState();
@@ -406,7 +406,7 @@ public class BluetoothRouteManager extends StateMachine { 
                        }

                        break;

                    case BT_AUDIO_LOST:

                        if (Objects.equals(mDeviceAddress, address)) {

                        if (Objects.equals(mDeviceAddress, address) || address == null) {

                            Log.i(LOG_TAG, "HFP connection with device %s lost.", mDeviceAddress);

                            transitionToActualState();

                        } else {

tests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java

+12 −0
Original line number Diff line number Diff line
@@ -538,6 +538,18 @@ public class BluetoothRouteTransitionTests extends TelecomTestCase { 
                .setExpectedFinalStateName(BluetoothRouteManager.AUDIO_OFF_STATE_NAME)

                .build());



        result.add(new BluetoothRouteTestParametersBuilder()

                .setName("Audio disconnect comes with a null device")

                .setInitialBluetoothState(BluetoothRouteManager.AUDIO_CONNECTED_STATE_NAME_PREFIX)

                .setInitialDevice(DEVICE2)

                .setConnectedDevices(DEVICE2)

                .setMessageType(BluetoothRouteManager.BT_AUDIO_LOST)

                .setMessageDevice(null)

                .setExpectedListenerUpdates(ListenerUpdate.AUDIO_DISCONNECTED)

                .setExpectedBluetoothInteraction(NONE)

                .setExpectedFinalStateName(BluetoothRouteManager.AUDIO_OFF_STATE_NAME)

                .build());



        result.add(new BluetoothRouteTestParametersBuilder()

                .setName("Device gets disconnected while pending. No fallback.")

                .setInitialBluetoothState(BluetoothRouteManager.AUDIO_CONNECTING_STATE_NAME_PREFIX)