Publish setLocation() method as a public Java API
related-to-bug: 4260295
Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
diff --git a/api/current.txt b/api/current.txt
index b88ef3a..8a39d5e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10113,6 +10113,7 @@
method public void setAuxiliaryOutputFile(java.lang.String);
method public void setCamera(android.hardware.Camera);
method public void setCaptureRate(double);
+ method public void setLocation(float, float);
method public void setMaxDuration(int) throws java.lang.IllegalArgumentException;
method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException;
method public void setOnErrorListener(android.media.MediaRecorder.OnErrorListener);
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 0f5a440..38202f2 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -347,7 +347,7 @@
}
/**
- * Store the geodata (latitude and longitude) in the output file.
+ * Set and store the geodata (latitude and longitude) in the output file.
* This method should be called before prepare(). The geodata is
* stored in udta box if the output format is OutputFormat.THREE_GPP
* or OutputFormat.MPEG_4, and is ignored for other output formats.
@@ -361,18 +361,17 @@
* @throws IllegalArgumentException if the given latitude or
* longitude is out of range.
*
- * {@hide}
*/
- public void setGeoData(float latitude, float longitude) {
+ public void setLocation(float latitude, float longitude) {
int latitudex10000 = (int) (latitude * 10000 + 0.5);
int longitudex10000 = (int) (longitude * 10000 + 0.5);
if (latitudex10000 > 900000 || latitudex10000 < -900000) {
- String msg = "Unsupported latitude: " + latitude;
+ String msg = "Latitude: " + latitude + " out of range.";
throw new IllegalArgumentException(msg);
}
if (longitudex10000 > 1800000 || longitudex10000 < -1800000) {
- String msg = "Unsupported longitude: " + longitude;
+ String msg = "Longitude: " + longitude + " out of range";
throw new IllegalArgumentException(msg);
}