commit 3a6eba01c48363f675090bd8e0f853a7fbf2165d
author Igor Murashkin <iam@google.com> Tue Aug 19 18:35:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 19 02:43:23 2014 +0000
tree 1ce2960345711548f850dcb9bd455d1f8d6cc259
parent ae0da7a81ca40366393a551170672a5e5c32115e
parent 517b74533afe53c740400bff3b85806884286344

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

core/java/android/hardware/camera2/params/StreamConfigurationMap.java

diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
index 2e6b9ae..c0b7967 100644
--- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
+++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
@@ -339,6 +339,11 @@
      * @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;
         }