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

Commit 14d5d4ac authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "Defer disconnect commands until post connecting state" into main am:... 

Merge "Defer disconnect commands until post connecting state" into main am: 9adb37e9 am: ef3ea9d1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2736114



Change-Id: If9cba14d839d29b0186fe44cfe4e3075dc06c394
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c39e7d8c ef3ea9d1

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+4 −0
Original line number Diff line number Diff line
@@ -218,6 +218,10 @@ public class A2dpSinkStateMachine extends StateMachine { 
                case CONNECT_TIMEOUT:

                    transitionTo(mDisconnected);

                    return true;

                case DISCONNECT:

                    Log.d(TAG, "Received disconnect message while connecting. deferred");

                    deferMessage(message);

                    return true;

            }

            return false;

        }

android/app/tests/unit/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachineTest.java

+8 −1
Original line number Diff line number Diff line
@@ -269,12 +269,19 @@ public class A2dpSinkStateMachineTest { 
    }



    @Test

    public void testDisconnectInConnecting() {

    public void testDisconnectInConnecting_disconnectDeferredAndProcessed() {

        testConnectInDisconnected();

        assertThat(mStateMachine.getState()).isEqualTo(BluetoothProfile.STATE_CONNECTING);

        mStateMachine.disconnect();

        TestUtils.waitForLooperToFinishScheduledTask(mStateMachine.getHandler().getLooper());

        assertThat(mStateMachine.getState()).isEqualTo(BluetoothProfile.STATE_CONNECTING);



        // send connected, disconnect should get processed

        sendConnectionEvent(BluetoothProfile.STATE_CONNECTED);

        TestUtils.waitForLooperToFinishScheduledTask(mStateMachine.getHandler().getLooper());

        verify(mNativeInterface, times(1)).disconnectA2dpSink(mDevice);

        verify(mService, timeout(TIMEOUT_MS).times(1)).removeStateMachine(mStateMachine);

        assertThat(mStateMachine.getState()).isEqualTo(BluetoothProfile.STATE_DISCONNECTED);

    }



    /**********************************************************************************************