diff options
author | Mike Lockwood <lockwood@android.com> | 2010-09-20 19:33:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-20 19:33:58 -0700 |
commit | 537ce32c71284f7bef40371778926f34d41f277e (patch) | |
tree | fa74b1f1e6db182562a07967c8a5dca951a34dd0 /location | |
parent | caa9aa08aaa5d3e879fcccad5c4bcb1c79fba6e3 (diff) | |
parent | 24956d36f46dd7be0b029a7b2b43c1020ae8a4c5 (diff) | |
download | frameworks_base-537ce32c71284f7bef40371778926f34d41f277e.zip frameworks_base-537ce32c71284f7bef40371778926f34d41f277e.tar.gz frameworks_base-537ce32c71284f7bef40371778926f34d41f277e.tar.bz2 |
am 24956d36: am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Merge commit '24956d36f46dd7be0b029a7b2b43c1020ae8a4c5'
* commit '24956d36f46dd7be0b029a7b2b43c1020ae8a4c5':
LocationManager: Hide location provider and geocode provider APIs.
Diffstat (limited to 'location')
5 files changed, 11 insertions, 5 deletions
diff --git a/location/java/android/location/Geocoder.java b/location/java/android/location/Geocoder.java index 546bb9d..ac7eb8b 100644 --- a/location/java/android/location/Geocoder.java +++ b/location/java/android/location/Geocoder.java @@ -41,7 +41,7 @@ import java.util.List; * The Geocoder class requires a backend service that is not included in * the core android framework. The Geocoder query methods will return an * empty list if there no backend service in the platform. Use the - * isImplemented() method to determine whether a Geocoder implementation + * isPresent() method to determine whether a Geocoder implementation * exists. */ public final class Geocoder { @@ -56,13 +56,13 @@ public final class Geocoder { * connectivity may still cause these methods to return null or * empty lists. */ - public static Boolean isImplemented() { + public static boolean isPresent() { IBinder b = ServiceManager.getService(Context.LOCATION_SERVICE); ILocationManager lm = ILocationManager.Stub.asInterface(b); try { - return lm.geocoderIsImplemented(); + return lm.geocoderIsPresent(); } catch (RemoteException e) { - Log.e(TAG, "isImplemented: got RemoteException", e); + Log.e(TAG, "isPresent: got RemoteException", e); return false; } } diff --git a/location/java/android/location/GeocoderParams.java b/location/java/android/location/GeocoderParams.java index 8b8e63b..174fe3e 100644 --- a/location/java/android/location/GeocoderParams.java +++ b/location/java/android/location/GeocoderParams.java @@ -29,6 +29,8 @@ 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/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl index 32d4b27..2255bf2 100644 --- a/location/java/android/location/ILocationManager.aidl +++ b/location/java/android/location/ILocationManager.aidl @@ -67,7 +67,7 @@ interface ILocationManager // it need not be shared with other providers. void reportLocation(in Location location, boolean passive); - boolean geocoderIsImplemented(); + boolean geocoderIsPresent(); String getFromLocation(double latitude, double longitude, int maxResults, in GeocoderParams params, out List<Address> addrs); String getFromLocationName(String locationName, diff --git a/location/java/android/location/provider/GeocodeProvider.java b/location/java/android/location/provider/GeocodeProvider.java index 9a58763..493c631 100644 --- a/location/java/android/location/provider/GeocodeProvider.java +++ b/location/java/android/location/provider/GeocodeProvider.java @@ -29,6 +29,8 @@ 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 95b4425..14dea14 100644 --- a/location/java/android/location/provider/LocationProvider.java +++ b/location/java/android/location/provider/LocationProvider.java @@ -34,6 +34,8 @@ 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 { |