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

Commit 84fd4b07 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Mark flaky tests flaky until we can figure out why" am: 2d087215 am: 487955b5 

am: e1dbb3d2

Change-Id: Ib1d0c37a0485a22be3e23f174ef5e6bc9a18fa9d
parents bece7901 e1dbb3d2

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

+1 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,7 @@ public class BasicCallTests extends TelecomSystemTest { 
     */

    @LargeTest

    @Test

    @FlakyTest

    public void testUnmuteDuringEmergencyCall() throws Exception {

        // Make an outgoing call and turn ON mute.

        IdPair outgoingCall = startAndMakeActiveOutgoingCall("650-555-1212",

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;
@@ -34,7 +33,7 @@ import com.android.server.telecom.TelecomSystem; 


import android.media.MediaPlayer;

import android.media.ToneGenerator;

import android.test.FlakyTest;

import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.SmallTest;



import org.junit.After;