From 4c4061210e52b7b1786ecb26a2dd7f8c1298e752 Mon Sep 17 00:00:00 2001
From: Daichi Hirono <hirono@google.com>
Date: Thu, 24 Dec 2015 12:43:12 +0900
Subject: [PATCH] Fix flakiness MtpManagerTest test.

The test for readEvent cancelling was flakiness because it can
successfully receives an event before the test tries to cancel it.

Change-Id: Ie7625dff53e07b8bc9888da03e78155e683a6d46
---
 .../tests/src/com/android/mtp/MtpManagerTest.java            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java
index ed617e71aeb2a..5e95e4f88386b 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java
@@ -61,8 +61,9 @@ public class MtpManagerTest extends InstrumentationTestCase {
                     @Override
                     public Boolean call() throws IOException {
                         try {
-                            mManager.readEvent(mUsbDevice.getDeviceId(), signal);
-                            return false;
+                            while (true) {
+                                mManager.readEvent(mUsbDevice.getDeviceId(), signal);
+                            }
                         } catch (OperationCanceledException exception) {
                             return true;
                         }