diff options
| author | Igor Murashkin <iam@google.com> | 2014-08-19 18:35:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 02:43:23 +0000 |
| commit | 3a6eba01c48363f675090bd8e0f853a7fbf2165d (patch) | |
| tree | 1ce2960345711548f850dcb9bd455d1f8d6cc259 /core/java/android/hardware/camera2 | |
| parent | ae0da7a81ca40366393a551170672a5e5c32115e (diff) | |
| parent | 517b74533afe53c740400bff3b85806884286344 (diff) | |
| download | frameworks_base-3a6eba01c48363f675090bd8e0f853a7fbf2165d.zip frameworks_base-3a6eba01c48363f675090bd8e0f853a7fbf2165d.tar.gz frameworks_base-3a6eba01c48363f675090bd8e0f853a7fbf2165d.tar.bz2 | |
Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/params/StreamConfigurationMap.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ 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; } |