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

Commit 9dd0561e authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "A2dpServiceTest: Sync test teardown on main looper" into main am: a81bd3c3 

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



Change-Id: I93516c467d9d8984bae267f703b75080aabc06f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c48412d a81bd3c3

android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ final class A2dpStateMachine extends StateMachine { 
        mA2dpService.codecConfigUpdated(mDevice, mCodecStatus, sameAudioFeedingParameters);

    }



    // This method does not check for error conditon (newState == prevState)

    // This method does not check for error condition (newState == prevState)

    private void broadcastConnectionState(int newState, int prevState) {

        log("Connection state " + mDevice + ": " + profileStateToString(prevState)

                    + "->" + profileStateToString(newState));

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpServiceTest.java

+6 −2
Original line number Diff line number Diff line
@@ -122,8 +122,12 @@ public class A2dpServiceTest { 
    }



    @After

    public void tearDown() throws Exception {

        mA2dpService.stop();

    public void tearDown() {

        // A2dpService handler is running on main looper. Calling `stop` remove the messages but

        // assume it is already on the correct thread.

        // Calling it from another thread may lead to having messages still being processed and

        // executed after tearDown is called.

        InstrumentationRegistry.getInstrumentation().runOnMainSync(mA2dpService::stop);

    }



    @SafeVarargs