diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-30 11:40:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-30 11:40:42 -0700 |
| commit | 83307bac03c27c1c344fd24fdfbabc2d0a63a29d (patch) | |
| tree | 3d8014fd5d1dc32bf9db8a0d0e0c7053739c36a7 | |
| parent | 63bfd7fe7d14fd083bebba3a230938e8d6f62fd5 (diff) | |
| parent | 38f910bdfa1fb0665261eb60e0afdb4986c8934f (diff) | |
| download | frameworks_av-83307bac03c27c1c344fd24fdfbabc2d0a63a29d.zip frameworks_av-83307bac03c27c1c344fd24fdfbabc2d0a63a29d.tar.gz frameworks_av-83307bac03c27c1c344fd24fdfbabc2d0a63a29d.tar.bz2 | |
am 38f910bd: am 23466a95: Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev
* commit '38f910bdfa1fb0665261eb60e0afdb4986c8934f':
Camera2: Require 2 JPEG thumbnail resolutions.
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 2 |
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 |