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

Commit 0522815f authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Remove verification of native method in InCallTonePlayerTest." into... 

Merge "Remove verification of native method in InCallTonePlayerTest." into tm-dev am: 22848b00 am: b124fe36

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/18205366



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

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

+3 −1
Original line number Diff line number Diff line
@@ -181,7 +181,9 @@ public class InCallTonePlayerTest extends TelecomTestCase { 
        mInCallTonePlayer.stopTone();

        // Timeouts due to threads!

        verify(mCallAudioManager, timeout(5000)).setIsTonePlaying(eq(false));

        verify(mToneGenerator, timeout(5000)).release();

        // Ideally it would be nice to verify this, however release is a native method so appears to

        // cause flakiness when testing on Cuttlefish.

        // verify(mToneGenerator, timeout(5000)).release();



        // Correctness check: ensure we can't start the tone again.

        assertFalse(mInCallTonePlayer.startTone());