commit 93e4080df6b8dee2e8d67813d6d1cb5c5fbd40bc
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Mar 23 09:10:29 2016 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Mar 23 13:16:59 2016 -0700
tree e4565bcad5b8c05711b6ee378ab75afe8501fa37
parent e090ffee08b87ae0803b87a9af0ff3ff3d2185a7

Camera: fix long proecessing tests

Make sure application keep consuming images until session is fully
closed.

Bug: 25935353
Change-Id: I41e2c117ff3afc169c0e927a007ff8acf242e47a

tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
index 1e9fe55..82ef4bc 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
@@ -29,6 +29,7 @@
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.cts.CameraTestUtils.ImageDropperListener;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.rs.BitmapUtils;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
@@ -862,7 +863,15 @@
                     Thread.sleep(LONG_PROCESS_TIME_MS);
                     img.close();
                 }
-                // stop capture.
+                // Stop capture.
+                // Drain the reader queue in case the full queue blocks
+                // HAL from delivering new results
+                ImageDropperListener imageDropperListener = new ImageDropperListener();
+                mReader.setOnImageAvailableListener(imageDropperListener, mHandler);
+                Image img = mReader.acquireLatestImage();
+                if (img != null) {
+                    img.close();
+                }
                 stopCapture(/*fast*/false);
             } finally {
                 closeDefaultImageReader();