diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-24 23:08:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-24 23:08:00 +0000 |
| commit | 2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd (patch) | |
| tree | bafcfc9df3d0e86cae2db36835159dac2b958202 /core/java/android/hardware/camera2 | |
| parent | def6896d10ce4869831bf91eb73709e8a9714b27 (diff) | |
| parent | e3f54839770066bbdd2886c962f5c72bd40f7d20 (diff) | |
| download | frameworks_base-2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd.zip frameworks_base-2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd.tar.gz frameworks_base-2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd.tar.bz2 | |
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
Diffstat (limited to 'core/java/android/hardware/camera2')
| -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; |