commit 4e068b34363901d4c1ee257d5b9eaf3894e5b3ea
author Jordan Liu <jminjie@google.com> Tue Feb 28 01:29:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 28 01:29:03 2017 +0000
tree de5612500058eaeea716e222dd043dcc8be6e411
parent cfd9d7fd68aa7de47e397b0c05825fb98e23af6f
parent c7dbd2c2c6bf5e07d5de389f2512454e577c2153

Merge "Add @FlakyTest annotation to @Postsubmit tests"

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index f4b8256..1e8b1af 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,6 +20,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
         android-ex-camera2 \
         android-support-v4 \
+        android-support-test \
         guava \
         mockito-target \
         platform-test-annotations \

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 590304c..83cee9d 100644
--- a/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
@@ -34,6 +34,7 @@
 import android.platform.test.annotations.Postsubmit;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
+import android.support.test.filters.FlakyTest;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
@@ -424,6 +425,7 @@
     }
 
     @MediumTest
+    @FlakyTest
     @Postsubmit
     public void testLogCallDirectionOutgoingWithMultiUserCapability() {
         when(mMockPhoneAccountRegistrar.getPhoneAccountUnchecked(any(PhoneAccountHandle.class)))
@@ -518,6 +520,7 @@
     }
 
     @MediumTest
+    @FlakyTest
     @Postsubmit
     public void testLogCallDirectionOutgoingFromManagedProfile() {
         when(mMockPhoneAccountRegistrar.getPhoneAccountUnchecked(any(PhoneAccountHandle.class)))