commit | 517b74533afe53c740400bff3b85806884286344 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Tue Aug 19 10:51:30 2014 -0700 |
committer | Igor Murashkin <iam@google.com> | Tue Aug 19 10:51:30 2014 -0700 |
tree | c1c77f1d47406ac074356eef1a0b9ae119dc0df5 | |
parent | 49e057d7eedb44f5397781254acab4e0ef08a9cf [diff] |
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader Return empty array since no implementation-defined sizes are supported Bug: 17007153 Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
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; }