From 517b74533afe53c740400bff3b85806884286344 Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Tue, 19 Aug 2014 10:51:30 -0700
Subject: [PATCH] camera2: Fix StreamConfigurationMap#getOutputSizes for
 ImageReader

Return empty array since no implementation-defined sizes are supported

Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
---
 .../hardware/camera2/params/StreamConfigurationMap.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
index 2e6b9aefc7d75..c0b79678c63c3 100644
--- 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;
         }