commit bdf643555822ec3023c4f71f421952e02a08e4f4
author Zhijun He <zhijunhe@google.com> Mon Apr 21 14:30:24 2014 -0700
committer Zhijun He <zhijunhe@google.com> Mon Apr 21 23:21:22 2014 +0000
tree 7c2cbe9b41fc8a16f7af575bc646178c87698ab1
parent e04e84a428e29cdccd67570443c36dfd20bade80

Camera2: Remove multiple jpeg image capture test WAR

With framework fix of bug 11595505, the WAR is no longer needed.

Change-Id: I490aca7b82dacccb26320018dfe3be14ac19264c

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

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
index 0922d72..733c7d2 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
@@ -161,9 +161,7 @@
             throw new IllegalArgumentException("Unsupported format: " + format);
         }
 
-        // FIXME: Need change revert to MAX_NUM_IMAGES - 1 when bug 11595505 is fixed, otherwise
-        // It will fail all subsequent tests.
-        final int NUM_SINGLE_CAPTURE_TESTED = 1; // MAX_NUM_IMAGES - 1;
+        final int NUM_SINGLE_CAPTURE_TESTED = MAX_NUM_IMAGES - 1;
         Size maxYuvSz = mOrderedPreviewSizes.get(0);
         Size[] targetCaptureSizes = mStaticInfo.getAvailableSizesForFormatChecked(format,
                 CameraCharacteristics.SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);