am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-dev

* commit '336f88ed91a43eb4d1d67fb805171433676279e3':
  camera2-api: Tag camera2 JPEGs with any provided location

1 files changed, 12 insertions, 1 deletions

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 26d0f85..cae022d 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
@@ -73,9 +73,20 @@ public abstract class CameraSettings {
         public final long timeStamp;
         public final String processingMethod;
 
-        /** Constructor. */
+        /**
+         * Construct what may or may not actually represent a location,
+         * depending on the value of {@code processingMethod}.
+         *
+         * <p>Setting {@code processingMethod} to {@code null} means that
+         * {@code latitude}, {@code longitude}, and {@code altitude} will be
+         * completely ignored.</p>
+         */
         public GpsData(double latitude, double longitude, double altitude, long timeStamp,
                 String processingMethod) {
+            if (processingMethod == null &&
+                    (latitude != 0.0 || longitude != 0.0 || altitude != 0.0)) {
+                Log.w(TAG, "GpsData's nonzero data will be ignored due to null processingMethod");
+            }
             this.latitude = latitude;
             this.longitude = longitude;
             this.altitude = altitude;