From e3f54839770066bbdd2886c962f5c72bd40f7d20 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Mon, 24 Aug 2015 14:06:12 -0700 Subject: 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 --- core/java/android/hardware/camera2/params/StreamConfigurationMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android/hardware/camera2') 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; -- cgit v1.1