Mark flaky tests flaky until we can figure out why
Bug: 121002637
Bug: 121277380
Test: atest TelecomUnitTests
Change-Id: I7a78b036dda4bd10bcad356a51c3e75d2cf0d9d4
diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
index 193f47f..36eea89 100644
--- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java
+++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
@@ -1116,6 +1116,7 @@
*/
@LargeTest
@Test
+ @FlakyTest
public void testUnmuteDuringEmergencyCall() throws Exception {
// Make an outgoing call and turn ON mute.
IdPair outgoingCall = startAndMakeActiveOutgoingCall("650-555-1212",
diff --git a/tests/src/com/android/server/telecom/tests/InCallTonePlayerTest.java b/tests/src/com/android/server/telecom/tests/InCallTonePlayerTest.java
index 14803c6..7cf8edb 100644
--- a/tests/src/com/android/server/telecom/tests/InCallTonePlayerTest.java
+++ b/tests/src/com/android/server/telecom/tests/InCallTonePlayerTest.java
@@ -21,7 +21,6 @@
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 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;
