diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-24 14:06:12 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-08-24 14:08:58 -0700 |
| commit | e3f54839770066bbdd2886c962f5c72bd40f7d20 (patch) | |
| tree | add4665d26dea1c03b2548c03fb0610a412b151f /core/java/android/hardware | |
| parent | cb59747de7222bc7310162c4174f7b460c34adef (diff) | |
| download | frameworks_base-e3f54839770066bbdd2886c962f5c72bd40f7d20.zip frameworks_base-e3f54839770066bbdd2886c962f5c72bd40f7d20.tar.gz frameworks_base-e3f54839770066bbdd2886c962f5c72bd40f7d20.tar.bz2 | |
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.
As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.
Guard the filtering correctly, to correctly support such
devices.
Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/params/StreamConfigurationMap.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java index e71e49f..b8d6960 100644 --- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java +++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java @@ -1290,7 +1290,7 @@ public final class StreamConfigurationMap { for (StreamConfiguration config : configurations) { int fmt = config.getFormat(); if (fmt == format && config.isOutput() == output) { - if (output) { + if (output && mListHighResolution) { // Filter slow high-res output formats; include for // highRes, remove for !highRes long duration = 0; |