summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Castro <logophile@google.com> 2019-11-21 20:04:05 -0800
committer android-build-merger <android-build-merger@google.com> 2019-11-21 20:04:05 -0800
commitd52dd84fbfd4ef2fb7b4c751b915c0e34c752893 (patch)
treef196143aa5bdf17b7ee366d901c255343d745256
parentf8a5719cfce3b180b901280f350a968be1ada90f (diff)
parentb69d94a847def4a6efe02f71ce65cecb804eff91 (diff)
Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev am: e3681d08e9 am: 0c8d339950
am: b69d94a847 Change-Id: I5b22d3a71f4b12d0695f45f4ced45f633c271030
-rw-r--r--location/java/android/location/Location.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java
index 9c36d76cf370..db06399f7376 100644
--- a/location/java/android/location/Location.java
+++ b/location/java/android/location/Location.java
@@ -158,7 +158,10 @@ public class Location implements Parcelable {
* <p>By default time, latitude and longitude are 0, and the location
* has no bearing, altitude, speed, accuracy or extras.
*
- * @param provider the name of the provider that generated this location
+ * @param provider the source that provides the location. It can be of type
+ * {@link LocationManager#GPS_PROVIDER}, {@link LocationManager#NETWORK_PROVIDER},
+ * or {@link LocationManager#PASSIVE_PROVIDER}. You can also define your own
+ * provider string, in which case an empty string is a valid provider.
*/
public Location(String provider) {
mProvider = provider;