diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-24 23:12:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 23:12:16 +0000 |
| commit | 6393275f5f8daa2d14dbc3fbd6511a78978999cd (patch) | |
| tree | 02188df120941b4f060e5527eafa62f6a430ae49 /core | |
| parent | d94d3a2aa5cd1f177f61f73733217c952e356c43 (diff) | |
| parent | 2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd (diff) | |
| download | frameworks_base-6393275f5f8daa2d14dbc3fbd6511a78978999cd.zip frameworks_base-6393275f5f8daa2d14dbc3fbd6511a78978999cd.tar.gz frameworks_base-6393275f5f8daa2d14dbc3fbd6511a78978999cd.tar.bz2 | |
am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Diffstat (limited to 'core')
| -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; |