am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev

* commit '77af33f81d2cbef1580a103c4efda6829f20c7e1': camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
2014-08-19 18:42:38 +00:00
parent 32052c01ff 3a6eba01c4
commit 7940bde7eb
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
+++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
@@ -339,6 +339,11 @@ public final class StreamConfigurationMap {
     * @see #isOutputSupportedFor(Class)
     */
    public <T> Size[] getOutputSizes(Class<T> klass) {
+        // Image reader is "supported", but never for implementation-defined formats; return empty
+        if (android.media.ImageReader.class.isAssignableFrom(klass)) {
+            return new Size[0];
+        }
+
        if (isOutputSupportedFor(klass) == false) {
            return null;
        }