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

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

Fix flaky conference tests am: 248f732f 

am: ca54a484

Change-Id: I0c8d1cc15a148feccf999508d4fd166db1ee7c0c
parents da248a1c ca54a484

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

+2 −2
Original line number Diff line number Diff line
@@ -388,8 +388,8 @@ public class TelecomSystemTest extends TelecomTestCase { 


        IInCallAdapter inCallAdapter = mInCallServiceFixtureX.getInCallAdapter();

        inCallAdapter.conference(callId1.mCallId, callId2.mCallId);

        // Wait for wacky non-deterministic behavior

        Thread.sleep(200);

        // Wait for the handler in ConnectionService

        waitForHandlerAction(new Handler(Looper.getMainLooper()), TEST_TIMEOUT);

        ParcelableCall call1 = mInCallServiceFixtureX.getCall(callId1.mCallId);

        ParcelableCall call2 = mInCallServiceFixtureX.getCall(callId2.mCallId);

        // Check that the two calls end up with a parent in the end