From 1c1d1afb5701b78fcdf09969bba1c20eb591bccf Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Mon, 29 Sep 2014 16:58:57 -0700 Subject: Remove default thumbnail size setting in portability lib Settings thumbnail size to (0,0) suppresses thumbnail generation. The Camera app did not set to (0,0) explicitly, but when porting Camera.Parameters to CameraSettings this crept in. Causes issue on Nakasi and no reason to suppress thumbnails in general. Bug: 17700333 Change-Id: I486e560bc9aaf05daf019a3aad8de78ee306f21b --- .../com/android/ex/camera2/portability/AndroidCameraAgentImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java') diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java index 992fcec..6a764f3 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java @@ -670,7 +670,9 @@ class AndroidCameraAgentImpl extends CameraAgent { } parameters.setRecordingHint(settings.isRecordingHintEnabled()); Size jpegThumbSize = settings.getExifThumbnailSize(); - parameters.setJpegThumbnailSize(jpegThumbSize.width(), jpegThumbSize.height()); + if (jpegThumbSize != null) { + parameters.setJpegThumbnailSize(jpegThumbSize.width(), jpegThumbSize.height()); + } parameters.setPictureFormat(settings.getCurrentPhotoFormat()); CameraSettings.GpsData gpsData = settings.getGpsData(); -- cgit v1.2.3