commit 2a8c99d092cabeb328db6e1209361f02d0d68ebc
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 09 23:31:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 09 23:31:51 2017 +0000
tree 48d9fb763abcfab8514bc7ece478b87a71dba7b7
parent 5756a7e766503690303708996b64ed47ab8717a5
parent 2110136ebf92cbf6ae7b551762f20b03aec032af

Merge "Wait for destoroying activities on EglConfigTest#testEglConfigs" into nougat-cts-dev

tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java

diff --git a/tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java b/tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java
old mode 100644
new mode 100755
index 33e8204..b22e421
--- a/tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java
+++ b/tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java
@@ -63,6 +63,10 @@
             EglConfigCtsActivity activity = launchActivity("android.graphics.cts",
                     EglConfigCtsActivity.class, extras);
             activity.waitToFinishDrawing();
+
+            // TODO(b/30948621): Remove the sleep below once b/30948621 is fixed.
+            Thread.sleep(500);
+
             activity.finish();
             mInstrumentation.waitForIdleSync();
         }