summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2014-11-12 23:50:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-12 23:50:35 +0000
commit7d5fcf19f74ce8a0ec62bfa6e76ebaaeafb6cbc4 (patch)
tree6ad0381462e7966fd5cf2764691cf4ce3b88ca57
parent782bac7b2818d96e56ab1e304f9f150bef70e8aa (diff)
parenta3d310ed23dadd652733854f6dd4ad565e5942d3 (diff)
downloadandroid_frameworks_ex-7d5fcf19f74ce8a0ec62bfa6e76ebaaeafb6cbc4.tar.gz
android_frameworks_ex-7d5fcf19f74ce8a0ec62bfa6e76ebaaeafb6cbc4.tar.bz2
android_frameworks_ex-7d5fcf19f74ce8a0ec62bfa6e76ebaaeafb6cbc4.zip
am a3d310ed: Merge commit \'1c1d1afb5701b78fcdf09969bba1c20eb591bccf\' into lmp-mr1-dev
* commit 'a3d310ed23dadd652733854f6dd4ad565e5942d3': Remove default thumbnail size setting in portability lib
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java4
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java22
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);
}
}