commit ceff2940f42e93e7d836460ce3ff1803e23d6b23
author Daniel Xie <dxie@google.com> Fri Nov 20 04:05:44 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 20 04:05:44 2015 +0000
tree ede95e931d1aed032444766fb18ed277a1a38bd6
parent 2a2c06e58341c74e934258b140ba4f56e8b57ccb
parent b8fbd66bfb3dc11239ab55d17b514ea62e6243eb

Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev

tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java

diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
index 380e47d..8b0756e 100755
--- a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
@@ -171,7 +171,7 @@
         if (LOGV) Log.v(TAG, "Shutdown of camera complete.");
     }
 
-    /** The camera preview callback. Stops capture after the first callback */
+    /** The camera preview callback. */
     private final class PreviewCallback
             implements android.hardware.Camera.PreviewCallback {
         public void onPreviewFrame(byte [] data, Camera camera) {
@@ -179,7 +179,6 @@
             assertNotNull(data);
             Size size = camera.getParameters().getPreviewSize();
             assertEquals(size.width * size.height * 3 / 2, data.length);
-            mCamera.stopPreview();
             mPreviewDone.open();
         }
     }
@@ -350,6 +349,7 @@
             mCamera.setPreviewTexture(mSurfaceTexture);
             noTimeout = waitForPreviewDone();
             assertTrue("Timeout waiting for new preview callback!", noTimeout);
+            mCamera.stopPreview();
             terminateMessageLooper();
 
             // Check the order: setPreviewTexture->startPreview.
@@ -359,6 +359,7 @@
             mCamera.startPreview();
             noTimeout = waitForPreviewDone();
             assertTrue("Timeout waiting for new preview callback!", noTimeout);
+            mCamera.stopPreview();
 
             // Check the order: setting preview display to null->startPreview->
             // setPreviewTexture.
@@ -368,6 +369,7 @@
             mCamera.setPreviewTexture(mSurfaceTexture);
             noTimeout = waitForPreviewDone();
             assertTrue("Timeout waiting for new preview callback!", noTimeout);
+            mCamera.stopPreview();
             terminateMessageLooper();
         }
     };
@@ -396,6 +398,7 @@
             assertTrue("Timeout waiting for new frame from SurfaceTexture!", noTimeout);
             noTimeout = waitForPreviewDone();
             assertTrue("Timeout waiting for new preview callback!",noTimeout);
+            mCamera.stopPreview();
 
             mGLView.requestRender();
             terminateMessageLooper();
@@ -413,6 +416,7 @@
             assertTrue("Timeout waiting for new frame from SurfaceTexture!", noTimeout);
             noTimeout = waitForPreviewDone();
             assertTrue("Timeout waiting for new preview callback!", noTimeout);
+            mCamera.stopPreview();
 
             mGLView.requestRender();
 
@@ -424,6 +428,7 @@
             mCamera.setPreviewTexture(mSurfaceTexture);
             noTimeout = waitForPreviewDone();
             assertTrue(noTimeout);
+            mCamera.stopPreview();
             terminateMessageLooper();
         }
     };