summaryrefslogtreecommitdiffstats
path: root/location
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-05-21 14:03:45 -0400
committerMike Lockwood <lockwood@android.com>2010-05-21 14:03:45 -0400
commit71677f84e7705aa48b04829538b954a13cd11dec (patch)
tree3d5239cffd784bdd02cecf2625dddf60735a8661 /location
parent03ca216ac19ea4e7afcb183c20c7c780f0d97756 (diff)
downloadframeworks_base-71677f84e7705aa48b04829538b954a13cd11dec.zip
frameworks_base-71677f84e7705aa48b04829538b954a13cd11dec.tar.gz
frameworks_base-71677f84e7705aa48b04829538b954a13cd11dec.tar.bz2
Unhide new location manager APIs:
Criteria.java LocationManager.java New APIs for criteria based location requests and single shot support. GeocoderParams.java GeocodeProvider.java LocationProvider.java APIs for network location unbundling. Change-Id: I3311fa01ce76fe4cba3537617e5b1c8d1f1d42b7 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'location')
-rw-r--r--location/java/android/location/Criteria.java19
-rw-r--r--location/java/android/location/GeocoderParams.java2
-rw-r--r--location/java/android/location/LocationManager.java12
-rw-r--r--location/java/android/location/provider/GeocodeProvider.java2
-rw-r--r--location/java/android/location/provider/LocationProvider.java2
5 files changed, 0 insertions, 37 deletions
diff --git a/location/java/android/location/Criteria.java b/location/java/android/location/Criteria.java
index 6210a38..647a9df 100644
--- a/location/java/android/location/Criteria.java
+++ b/location/java/android/location/Criteria.java
@@ -63,7 +63,6 @@ public class Criteria implements Parcelable {
* For horizontal and vertical position this corresponds to an accuracy
* greater than 500 meters. For speed and bearing, this corresponds
* to greater than 5 meters/second velocity and 10 degrees for bearing.
- * {@hide}
*/
public static final int ACCURACY_LOW = 1;
@@ -74,7 +73,6 @@ public class Criteria implements Parcelable {
* 100 and 500 meters, and between 200 and 500 meters for vertical accuracy.
* For speed and bearing, this corresponds to 1 meter/second to 5 meters/second
* velocity and and between 5 and 10 degrees for bearing.
- * {@hide}
*/
public static final int ACCURACY_MEDIUM = 2;
@@ -84,7 +82,6 @@ public class Criteria implements Parcelable {
* For horizontal and vertical position this corresponds to an accuracy
* less than 100 meters. For speed and bearing, this corresponds
* to less 1 meter/second velocity less than 5 degrees for bearing.
- * {@hide}
*/
public static final int ACCURACY_HIGH = 3;
@@ -92,37 +89,31 @@ public class Criteria implements Parcelable {
* a constant indicating the best accuracy that is available for any
* location provider available
* - may be used for horizontal, altitude, speed or bearing accuracy.
- * {@hide}
*/
public static final int ACCURACY_BEST = 4;
/**
* A constant indicating horizontal accuracy has the top priority
- * {@hide}
*/
public static final int HORIZONTAL_ACCURACY_PRIORITY = 1;
/**
* A constant indicating altitude accuracy has the top priority
- * {@hide}
*/
public static final int VERTICAL_ACCURACY_PRIORITY = 2;
/**
* A constant indicating speed accuracy has the top priority
- * {@hide}
*/
public static final int SPEED_ACCURACY_PRIORITY = 3;
/**
* A constant indicating bearing accuracy has the top priority
- * {@hide}
*/
public static final int BEARING_ACCURACY_PRIORITY = 4;
/**
* A constant indicating power requirement has the top priority
- * {@hide}
*/
public static final int POWER_REQUIREMENT_PRIORITY = 5;
@@ -168,7 +159,6 @@ public class Criteria implements Parcelable {
* More accurate location may consume more power and may take longer.
*
* @throws IllegalArgumentException if accuracy is not one of the supported constants
- * {@hide}
*/
public void setHorizontalAccuracy(int accuracy) {
if (accuracy < NO_REQUIREMENT || accuracy > ACCURACY_BEST) {
@@ -181,7 +171,6 @@ public class Criteria implements Parcelable {
* Returns a constant indicating the desired horizontal accuracy (latitude and longitude).
* Accuracy may be {@link #ACCURACY_LOW}, {@link #ACCURACY_MEDIUM},
* {@link #ACCURACY_HIGH}, {@link #ACCURACY_BEST},
- * {@hide}
*/
public int getHorizontalAccuracy() {
return mHorizontalAccuracy;
@@ -194,7 +183,6 @@ public class Criteria implements Parcelable {
* More accurate location may consume more power and may take longer.
*
* @throws IllegalArgumentException if accuracy is not one of the supported constants
- * {@hide}
*/
public void setVerticalAccuracy(int accuracy) {
if (accuracy < NO_REQUIREMENT || accuracy > ACCURACY_BEST) {
@@ -207,7 +195,6 @@ public class Criteria implements Parcelable {
* Returns a constant indicating the desired vertical accuracy (altitude).
* Accuracy may be {@link #ACCURACY_LOW}, {@link #ACCURACY_MEDIUM},
* {@link #ACCURACY_HIGH}, {@link #ACCURACY_BEST},
- * {@hide}
*/
public int getVerticalAccuracy() {
return mVerticalAccuracy;
@@ -220,7 +207,6 @@ public class Criteria implements Parcelable {
* More accurate location may consume more power and may take longer.
*
* @throws IllegalArgumentException if accuracy is not one of the supported constants
- * {@hide}
*/
public void setSpeedAccuracy(int accuracy) {
if (accuracy < NO_REQUIREMENT || accuracy > ACCURACY_BEST) {
@@ -233,7 +219,6 @@ public class Criteria implements Parcelable {
* Returns a constant indicating the desired speed accuracy
* Accuracy may be {@link #ACCURACY_LOW}, {@link #ACCURACY_MEDIUM},
* {@link #ACCURACY_HIGH}, {@link #ACCURACY_BEST},
- * {@hide}
*/
public int getSpeedAccuracy() {
return mSpeedAccuracy;
@@ -246,7 +231,6 @@ public class Criteria implements Parcelable {
* More accurate location may consume more power and may take longer.
*
* @throws IllegalArgumentException if accuracy is not one of the supported constants
- * {@hide}
*/
public void setBearingAccuracy(int accuracy) {
if (accuracy < NO_REQUIREMENT || accuracy > ACCURACY_BEST) {
@@ -259,7 +243,6 @@ public class Criteria implements Parcelable {
* Returns a constant indicating the desired bearing accuracy.
* Accuracy may be {@link #ACCURACY_LOW}, {@link #ACCURACY_MEDIUM},
* {@link #ACCURACY_HIGH}, {@link #ACCURACY_BEST},
- * {@hide}
*/
public int getBearingAccuracy() {
return mBearingAccuracy;
@@ -277,7 +260,6 @@ public class Criteria implements Parcelable {
* {@link #HORIZONTAL_ACCURACY_PRIORITY}, {@link #POWER_REQUIREMENT_PRIORITY},
* {@link #VERTICAL_ACCURACY_PRIORITY}, {@link #SPEED_ACCURACY_PRIORITY},
* {@link #BEARING_ACCURACY_PRIORITY}.
- * {@hide}
*/
public void setPreferredPriority(int priority) {
if (priority < HORIZONTAL_ACCURACY_PRIORITY || priority > POWER_REQUIREMENT_PRIORITY) {
@@ -292,7 +274,6 @@ public class Criteria implements Parcelable {
* The value can be {@link #HORIZONTAL_ACCURACY_PRIORITY},
* {@link #VERTICAL_ACCURACY_PRIORITY}, {@link #SPEED_ACCURACY_PRIORITY},
* {@link #BEARING_ACCURACY_PRIORITY} or {@link #POWER_REQUIREMENT_PRIORITY}.
- * {@hide}
*/
public int getPriority() {
return mPriority;
diff --git a/location/java/android/location/GeocoderParams.java b/location/java/android/location/GeocoderParams.java
index 174fe3e..8b8e63b 100644
--- a/location/java/android/location/GeocoderParams.java
+++ b/location/java/android/location/GeocoderParams.java
@@ -29,8 +29,6 @@ import java.util.Locale;
* as well as the Geocoder client's package name for geocoder server
* logging. This information is kept in a separate class to allow for
* future expansion of the IGeocodeProvider interface.
- *
- * @hide
*/
public class GeocoderParams implements Parcelable {
private Locale mLocale;
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 11beadc..7d07e4b 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -545,8 +545,6 @@ public class LocationManager {
* @throws IllegalArgumentException if listener is null
* @throws SecurityException if no suitable permission is present to access
* the location services.
- *
- * {@hide}
*/
public void requestLocationUpdates(long minTime, float minDistance,
Criteria criteria, LocationListener listener, Looper looper) {
@@ -683,8 +681,6 @@ public class LocationManager {
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if intent is null
* @throws SecurityException if no suitable permission is present for the provider.
- *
- * {@hide}
*/
public void requestLocationUpdates(long minTime, float minDistance, Criteria criteria, PendingIntent intent) {
if (criteria == null) {
@@ -740,8 +736,6 @@ public class LocationManager {
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if listener is null
* @throws SecurityException if no suitable permission is present for the provider.
- *
- * {@hide}
*/
public void requestSingleUpdate(String provider, LocationListener listener, Looper looper) {
if (provider == null) {
@@ -783,8 +777,6 @@ public class LocationManager {
* @throws IllegalArgumentException if listener is null
* @throws SecurityException if no suitable permission is present to access
* the location services.
- *
- * {@hide}
*/
public void requestSingleUpdate(Criteria criteria, LocationListener listener, Looper looper) {
if (criteria == null) {
@@ -813,8 +805,6 @@ public class LocationManager {
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if intent is null
* @throws SecurityException if no suitable permission is present for the provider.
- *
- * {@hide}
*/
public void requestSingleUpdate(String provider, PendingIntent intent) {
if (provider == null) {
@@ -844,8 +834,6 @@ public class LocationManager {
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if intent is null
* @throws SecurityException if no suitable permission is present for the provider.
- *
- * {@hide}
*/
public void requestSingleUpdate(Criteria criteria, PendingIntent intent) {
if (criteria == null) {
diff --git a/location/java/android/location/provider/GeocodeProvider.java b/location/java/android/location/provider/GeocodeProvider.java
index 86376a7..db5c078 100644
--- a/location/java/android/location/provider/GeocodeProvider.java
+++ b/location/java/android/location/provider/GeocodeProvider.java
@@ -29,8 +29,6 @@ import java.util.List;
* outside of the core android platform.
* Geocode providers can be implemented as services and return the result of
* {@link GeocodeProvider#getBinder()} in its getBinder() method.
- *
- * @hide
*/
public abstract class GeocodeProvider {
diff --git a/location/java/android/location/provider/LocationProvider.java b/location/java/android/location/provider/LocationProvider.java
index 1b5675d..5771363 100644
--- a/location/java/android/location/provider/LocationProvider.java
+++ b/location/java/android/location/provider/LocationProvider.java
@@ -33,8 +33,6 @@ import android.util.Log;
* outside of the core android platform.
* Location providers can be implemented as services and return the result of
* {@link LocationProvider#getBinder()} in its getBinder() method.
- *
- * @hide
*/
public abstract class LocationProvider {