From 1c1d1afb5701b78fcdf09969bba1c20eb591bccf Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
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
---
 .../portability/AndroidCameraAgentImpl.java        |  4 +++-
 .../ex/camera2/portability/CameraSettings.java     | 22 ++++++++++++----------
 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 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();
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);
     }
 }
-- 
cgit v1.2.3