2 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index e3856600a..647e67e8f 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -835,6 +835,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);