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

Commit c040bd1d authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Mark testEndCallToneWhenNotSilenced as flaky." am: dc176fa4 am: 16f87298

am: 88c93f2b

Change-Id: I01f5be9d64dd3064ec772adb87182c0cde7d42b3
parents 16da1f29 88c93f2b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.server.telecom.TelecomSystem;

import android.media.MediaPlayer;
import android.media.ToneGenerator;
import android.test.FlakyTest;
import android.test.suitebuilder.annotation.SmallTest;

import org.junit.After;
@@ -133,6 +134,7 @@ public class InCallTonePlayerTest extends TelecomTestCase {
        verify(mMediaPlayerFactory, never()).get(anyInt(), any());
    }

    @FlakyTest
    @SmallTest
    @Test
    public void testEndCallToneWhenNotSilenced() {