summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaesung Chung <jaesung@google.com>2017-10-19 23:59:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-19 23:59:12 +0000
commitcb4ba1e0594f4898d085cabc1579ac5335bbdf1b (patch)
tree0de562bd1fb4047918d6b1cf50ac47f34ef3aa30
parent3b832a58721e43ef9189f6bdcb43dd04bae8d44a (diff)
parentdd7ed76e38b6ca96184ee1029668429a075cf0f5 (diff)
downloadcts-cb4ba1e0594f4898d085cabc1579ac5335bbdf1b.tar.gz
Merge "CtsGraphicsTestCases: increase timeout in CameraGpuTest" into oc-mr1-dev
-rw-r--r--tests/tests/graphics/src/android/graphics/cts/CameraGpuCtsActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/graphics/src/android/graphics/cts/CameraGpuCtsActivity.java b/tests/tests/graphics/src/android/graphics/cts/CameraGpuCtsActivity.java
index b743e7d5162..466912a2884 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CameraGpuCtsActivity.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CameraGpuCtsActivity.java
@@ -93,7 +93,7 @@ public class CameraGpuCtsActivity extends Activity {
public void waitToFinishRendering() throws InterruptedException {
// Wait long enough so that all frames are captured.
- if (!mFinishedRendering.await(10, TimeUnit.SECONDS)) {
+ if (!mFinishedRendering.await(30, TimeUnit.SECONDS)) {
throw new IllegalStateException("Coudn't finish drawing frames!");
}
}