commit 3fe9eba9044c0b20ed349a4b9094bf1fa7942cdf
author Ruben Brunk <rubenbrunk@google.com> Thu Jul 24 13:33:47 2014 -0700
committer Ruben Brunk <rubenbrunk@google.com> Wed Jul 30 22:09:41 2014 +0000
tree e653085cf7e851f68eaaa38f1edc8f33f4235081
parent 63e646eed5a8d7f5d04544ac8628f65b0173cf3a

camera2: Add scene and effect mode for LEGACY.

Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115

core/java/android/hardware/camera2/legacy/CaptureCollector.java

diff --git a/core/java/android/hardware/camera2/legacy/CaptureCollector.java b/core/java/android/hardware/camera2/legacy/CaptureCollector.java
index af58a8a..307e466 100644
--- a/core/java/android/hardware/camera2/legacy/CaptureCollector.java
+++ b/core/java/android/hardware/camera2/legacy/CaptureCollector.java
@@ -236,6 +236,11 @@
                 Log.d(TAG, "queueRequest  for request " + holder.getRequestId() +
                         " - " + mInFlight + " requests remain in flight.");
             }
+
+            if (!(h.needsJpeg || h.needsPreview)) {
+                throw new IllegalStateException("Request must target at least one output surface!");
+            }
+
             if (h.needsJpeg) {
                 // Wait for all current requests to finish before queueing jpeg.
                 while (mInFlight > 0) {
@@ -259,9 +264,6 @@
                 mInFlightPreviews++;
             }
 
-            if (!(h.needsJpeg || h.needsPreview)) {
-                throw new IllegalStateException("Request must target at least one output surface!");
-            }
 
             mInFlight++;
             return true;