diff options
author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:59:45 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:59:45 -0700 |
commit | 5d744d01626ef5d31e1533c4b81bac1d692cbd60 (patch) | |
tree | 0567f4a2d8724c9b8eb4307af9bf1ac1aa01840c | |
parent | bad5188620be4868156da276cf8ba890288d1987 (diff) | |
parent | 4b4ea39a0733fea439072337aeb5cf558e557449 (diff) | |
download | android_packages_apps_Snap-5d744d01626ef5d31e1533c4b81bac1d692cbd60.tar.gz android_packages_apps_Snap-5d744d01626ef5d31e1533c4b81bac1d692cbd60.tar.bz2 android_packages_apps_Snap-5d744d01626ef5d31e1533c4b81bac1d692cbd60.zip |
Merge "SnapdragonCamera: Add manufacture and model info" into camera.lnx.1.0-dev.1.0
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/exif/ExifInterface.java | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index a3d0832fd..9a0e9ce7e 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -832,6 +832,7 @@ public class WideAnglePanoramaModule ExifInterface exif = new ExifInterface(); try { exif.readExif(jpegData); + exif.addMakeAndModelTag(); exif.addGpsDateTimeStampTag(mTimeTaken); exif.addDateTimeStampTag(ExifInterface.TAG_DATE_TIME, mTimeTaken, TimeZone.getDefault()); diff --git a/src/com/android/camera/exif/ExifInterface.java b/src/com/android/camera/exif/ExifInterface.java index f353f3586..2fec1bf4f 100644 --- a/src/com/android/camera/exif/ExifInterface.java +++ b/src/com/android/camera/exif/ExifInterface.java @@ -19,6 +19,7 @@ package com.android.camera.exif; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.util.SparseIntArray; +import android.os.Build; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -2028,6 +2029,21 @@ public class ExifInterface { return true; } + public boolean addMakeAndModelTag() { + ExifTag t = buildTag(TAG_MAKE, Build.MANUFACTURER); + if (t == null) { + return false; + } + setTag(t); + t = buildTag(TAG_MODEL, Build.MODEL); + if (t == null) { + return false; + } + setTag(t); + return true; + } + + private static Rational[] toExifLatLong(double value) { // convert to the format dd/1 mm/1 ssss/100 value = Math.abs(value); |