am 8e55e88f: Merge "Fix broken Javadoc links" into kraken (f1de96d4) · Commits · e / os / android_frameworks_base

location/java/android/location/provider/GeocodeProvider.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public abstract class GeocodeProvider {

		/**
		* This method is overridden to implement the
		* {@link Geocoder#getFromLocation(double, double, int)} method.
		* {@link android.location.Geocoder#getFromLocation(double, double, int)} method.
		* Classes implementing this method should not hold a reference to the params parameter.
		*/
		public abstract String onGetFromLocation(double latitude, double longitude, int maxResults,
		@@ -59,7 +59,7 @@ public abstract class GeocodeProvider {

		/**
		* This method is overridden to implement the
		* {@link Geocoder#getFromLocationName(String, int, double, double, double, double)} method.
		* {@link android.location.Geocoder#getFromLocationName(String, int, double, double, double, double)} method.
		* Classes implementing this method should not hold a reference to the params parameter.
		*/
		public abstract String onGetFromLocationName(String locationName,

+6 −6

Original line number	Diff line number	Diff line
		@@ -255,11 +255,11 @@ public abstract class LocationProvider {

		/**
		* Returns a information on the status of this provider.
		* {@link #OUT_OF_SERVICE} is returned if the provider is
		* {@link android.location.LocationProvider#OUT_OF_SERVICE} is returned if the provider is
		* out of service, and this is not expected to change in the near
		* future; {@link #TEMPORARILY_UNAVAILABLE} is returned if
		* future; {@link android.location.LocationProvider#TEMPORARILY_UNAVAILABLE} is returned if
		* the provider is temporarily unavailable but is expected to be
		* available shortly; and {@link #AVAILABLE} is returned
		* available shortly; and {@link android.location.LocationProvider#AVAILABLE} is returned
		* if the provider is currently available.
		*
		* <p> If extras is non-null, additional status information may be
		@@ -308,9 +308,9 @@ public abstract class LocationProvider {

		/**
		* Updates the network state for the given provider. This function must
		* be overwritten if {@link #requiresNetwork} returns true. The state is
		* {@link #TEMPORARILY_UNAVAILABLE} (disconnected), OR {@link #AVAILABLE}
		* (connected or connecting).
		* be overwritten if {@link android.location.LocationProvider#requiresNetwork} returns true.
		* The state is {@link android.location.LocationProvider#TEMPORARILY_UNAVAILABLE} (disconnected)
		* OR {@link android.location.LocationProvider#AVAILABLE} (connected or connecting).
		*
		* @param state data state
		*/