summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaesung Chung <jaesung@google.com>2017-10-21 01:29:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-21 01:29:26 +0000
commit720941d794fa15ad8cf3ca4c60622e82c8e7e40c (patch)
tree41450290eb0d931b4eac70e930d51d4ebf5aea0e
parent0fbe826968d41d8d33bcb24de187a097978dea04 (diff)
parenta055fd1fbd14d5360353706f0b5a4eb8535b4323 (diff)
downloadcts-720941d794fa15ad8cf3ca4c60622e82c8e7e40c.tar.gz
Merge "CtsViewTestCases: fix flakiness in DragDropTest" into oc-mr1-dev
-rw-r--r--tests/tests/view/src/android/view/cts/DragDropTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/tests/view/src/android/view/cts/DragDropTest.java b/tests/tests/view/src/android/view/cts/DragDropTest.java
index f32f79a4120..39ae2d3360c 100644
--- a/tests/tests/view/src/android/view/cts/DragDropTest.java
+++ b/tests/tests/view/src/android/view/cts/DragDropTest.java
@@ -283,6 +283,9 @@ public class DragDropTest {
mActivity = mActivityRule.getActivity();
mStartReceived = new CountDownLatch(1);
mEndReceived = new CountDownLatch(1);
+
+ // Wait for idle
+ mInstrumentation.waitForIdleSync();
}
@After