Add Location to EXIF

  Bug: 16961102

Change-Id: I9f2335c0f02bea1286698330483cd30fdb875f45

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/camera/util/ExifUtil.java b/src/com/android/camera/util/ExifUtil.java
index a7c5b32ec..ef340102b 100644
--- a/src/com/android/camera/util/ExifUtil.java
+++ b/src/com/android/camera/util/ExifUtil.java
@@ -65,9 +65,11 @@ public class ExifUtil {
      *
      * @param image A {@link TaskImageContainer.TaskImage} from which to extract info from.
      * @param captureResult A {@link CaptureResultProxy} from which to extract info from.
+     * @param location optinally a location that should be added to the EXIF.
      */
     public void populateExif(Optional<TaskImageContainer.TaskImage> image,
-                             Optional<CaptureResultProxy> captureResult) {
+                             Optional<CaptureResultProxy> captureResult,
+                             Optional<Location> location) {
         addMakeAndModelToExif();
         if (image.isPresent()) {
             addImageDataToExif(image.get());
@@ -75,6 +77,9 @@ public class ExifUtil {
         if (captureResult.isPresent()) {
             addCaptureResultToExif(mExif, captureResult.get());
         }
+        if (location.isPresent()) {
+            addLocationToExif(location.get());
+        }
     }
 
     private void addMakeAndModelToExif() {