commit 2809bd00cd857d298d675c083864317cd7877b2c
author John Reck <jreck@google.com> Fri Jun 19 13:23:39 2020 -0700
committer John Reck <jreck@google.com> Fri Jun 19 13:23:39 2020 -0700
tree a6926b0cabf62f710ae3cc151fa1f98cb3503066
parent 53396d44091d0d9894ad239c84427732e67aefc3

Avoid PixelCopy timeout on some devices

Bug: 151305118
Bug: 144138757
Fixes: 158034367
Test: this, verified still passes on blueline
Change-Id: Ie79af289fe754dc77c0473b609fcb565e504d656

tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java

diff --git a/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java b/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java
index 66b1539..7ab5143 100644
--- a/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java
@@ -19,6 +19,7 @@
 import static android.opengl.GLES20.GL_COLOR_BUFFER_BIT;
 import static android.opengl.GLES20.glClear;
 import static android.opengl.GLES20.glClearColor;
+import static android.opengl.GLES20.glFinish;
 
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
@@ -258,6 +259,7 @@
         int surfaceUpdateCount = mSurfaceUpdatedCount;
         runOnGLThread(() -> {
             callback.drawFrame(mSurfaceWidth, mSurfaceHeight);
+            glFinish();
             if (!mEgl.eglSwapBuffers(mEglDisplay, mEglSurface)) {
                 throw new RuntimeException("Cannot swap buffers");
             }