commit c174fb10332afdcece0dc33ce8c6d1a5b9d10ef9
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 19 22:28:06 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 19 22:28:06 2020 +0000
tree 9ce2d2b6673cf5bddf77e25fde7265c19143bdfa
parent 5f66384c4b5b90b642edc1be1d2f1eee2b705030
parent 2809bd00cd857d298d675c083864317cd7877b2c

Merge "Avoid PixelCopy timeout on some devices" into rvc-dev

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");
             }