Camera2: Require 2 JPEG thumbnail resolutions.

Include (0,0) as a required thumbnail resolution, to allow turning off
thumbnails.

Change-Id: I3c4efe2d6a4f576a11ce5b75a3d573812a100b80

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 91c5141..2f7d023 100644 (file)
--- 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