diff --git a/api/current.xml b/api/current.xml
index d792a410ac4ca..70a4c57b47b8b 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -74310,7 +74310,7 @@
type="float"
transient="false"
volatile="false"
- value="0.0010f"
+ value="0.001f"
static="true"
final="true"
deprecated="not deprecated"
@@ -83010,6 +83010,17 @@
visibility="public"
>
+
+
-
+
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 3484d559791da..4dddfd80ad377 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1331,7 +1331,7 @@ public class Camera {
}
/**
- * Sets GPS processing method. It will store up to 100 characters
+ * Sets GPS processing method. It will store up to 32 characters
* in JPEG EXIF header.
*
* @param processing_method The processing method to get this location.
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 429275458f806..b26906d1412f4 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -59,6 +59,8 @@ public class ExifInterface {
public static final String TAG_WHITE_BALANCE = "WhiteBalance";
/** Type is rational. */
public static final String TAG_FOCAL_LENGTH = "FocalLength";
+ /** Type is String. Name of GPS processing method used for location finding. */
+ public static final String TAG_GPS_PROCESSING_METHOD = "GPSProcessingMethod";
// Constants used for the Orientation Exif tag.
public static final int ORIENTATION_UNDEFINED = 0;