Merge commit '1c1d1afb5701b78fcdf09969bba1c20eb591bccf' into lmp-mr1-dev

2 files changed, 15 insertions, 11 deletions

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 61a1cc7..8e17276 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -669,7 +669,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();
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
index 87e9adf..ccd980a 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
@@ -58,7 +58,7 @@ public abstract class CameraSettings {
     protected boolean mAutoWhiteBalanceLocked;
     protected boolean mRecordingHintEnabled;
     protected GpsData mGpsData;
-    protected Size mExifThumbnailSize = new Size(0,0);
+    protected Size mExifThumbnailSize;
 
     /**
      * An immutable class storing GPS related information.
@@ -491,20 +491,22 @@ public abstract class CameraSettings {
     }
 
     /**
-     * Sets the size of the thumbnail in EXIF header.
+     * Sets the size of the thumbnail in EXIF header. To suppress thumbnail
+     * generation, set a size of (0,0).
      *
-     * @param s The size for the thumbnail. {@code null} will clear the size to
-     *          (0,0).
+     * @param s The size for the thumbnail. If {@code null}, agent will not
+     *          set a thumbnail size.
      */
     public void setExifThumbnailSize(Size s) {
-        if (s != null) {
-            mExifThumbnailSize = s;
-        } else {
-            mExifThumbnailSize = new Size(0,0);
-        }
+        mExifThumbnailSize = s;
     }
 
+    /**
+     * Gets the size of the thumbnail in EXIF header.
+     *
+     * @return desired thumbnail size, or null if no size was set
+     */
     public Size getExifThumbnailSize() {
-        return new Size(mExifThumbnailSize);
+        return (mExifThumbnailSize == null) ? null : new Size(mExifThumbnailSize);
     }
 }