summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-08-28 13:38:23 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-08-30 09:50:42 -0700
commitf128dc51c81e6b831806e0de505e4edbb02b7e71 (patch)
treee394875bf4bc23a5bc1d34d814d2236c1f4861a3 /services
parentd86a6880fe86bda21a9b53b240996fc410a512a5 (diff)
downloadframeworks_av-f128dc51c81e6b831806e0de505e4edbb02b7e71.zip
frameworks_av-f128dc51c81e6b831806e0de505e4edbb02b7e71.tar.gz
frameworks_av-f128dc51c81e6b831806e0de505e4edbb02b7e71.tar.bz2
Camera2: Require 2 JPEG thumbnail resolutions.
Include (0,0) as a required thumbnail resolution, to allow turning off thumbnails. Change-Id: I3c4efe2d6a4f576a11ce5b75a3d573812a100b80
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/camera2/Parameters.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 91c5141..2f7d023 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -208,7 +208,7 @@ status_t Parameters::initialize(const CameraMetadata *info) {
CameraParameters::PIXEL_FORMAT_JPEG);
camera_metadata_ro_entry_t availableJpegThumbnailSizes =
- staticInfo(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES, 2);
+ staticInfo(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES, 4);
if (!availableJpegThumbnailSizes.count) return NO_INIT;
// TODO: Pick default thumbnail size sensibly