am 52814d3e: am 9ca10728: am 7eb56cec: Merge "Fix VoicemailPlaybackTest flakiness." into mnc-dev

* commit '52814d3e24133add9628b9bf9e5eb33f30af7a83':
  Fix VoicemailPlaybackTest flakiness.

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
index dd86b0d6f..96ef62abf 100644
--- a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
+++ b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
@@ -109,6 +109,7 @@ public class VoicemailPlaybackTest extends InstrumentationTestCase {
         // There is a background check that is testing to see if we have the content available.
         // Once that task completes, we shouldn't be showing the fetching message.
         mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT);
+        getInstrumentation().waitForIdleSync();
 
         assertHasOneTextViewContaining("Buffering");
         assertHasZeroTextViewsContaining("Loading voicemail");
@@ -119,6 +120,7 @@ public class VoicemailPlaybackTest extends InstrumentationTestCase {
         setPlaybackViewForPresenter();
 
         mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT);
+        getInstrumentation().waitForIdleSync();
 
         // The media player will have thrown an IOException since the file doesn't exist.
         // This should have put a failed to play message on screen, buffering is gone.