commit 1623c5d31582c8cf145be7b1b23e2445e8a06ce4
author Brad Ebinger <breadley@google.com> Tue Oct 16 14:04:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 16 14:04:14 2018 -0700
tree 10ad4afb90922b89a98c51c48414919805019c7f
parent 3be657bae907252bec46c9f0531aa80f5dcdaece
parent d6f70029e4b5fc690dfaf40234b1d3a20ac958ce

Merge "Mark Methods Flaky to unblock until they are fixed"
am: d6f70029e4

Change-Id: Ia64b80a337d9c0a9dd3d56f2787d56e115686d0d

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

diff --git a/tests/src/com/android/server/telecom/tests/CallExtrasTest.java b/tests/src/com/android/server/telecom/tests/CallExtrasTest.java
index 44578c5..3bedb75 100644
--- a/tests/src/com/android/server/telecom/tests/CallExtrasTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallExtrasTest.java
@@ -22,6 +22,7 @@
 import android.telecom.Connection;
 import android.telecom.InCallService;
 import android.telecom.ParcelableCall;
+import android.support.test.filters.FlakyTest;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
@@ -398,6 +399,7 @@
      * @throws Exception
      */
     @LargeTest
+    @FlakyTest(bugId = 117751305)
     @Test
     public void testConferenceExtraOperations() throws Exception {
         ParcelableCall call = makeConferenceCall();

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

diff --git a/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java b/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
index 690a38a..c83c3f3 100644
--- a/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
@@ -538,6 +538,7 @@
     }
 
     @MediumTest
+    @FlakyTest(bugId = 117751305)
     @Test
     public void testLogCallDirectionIncomingWithMultiUserCapability() {
         when(mMockPhoneAccountRegistrar.getPhoneAccountUnchecked(any(PhoneAccountHandle.class)))