diff options
| author | Tom O'Neill <tomo@google.com> | 2013-09-11 19:20:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 19:20:16 +0000 |
| commit | 706113fa2a82e5b613b8555120025b8472ffcbf3 (patch) | |
| tree | 8a75c5d59b662125fac18c99eb0257a2c2364e7c /core | |
| parent | e0b7e4cf455b21316661b158edee12ac5467995c (diff) | |
| parent | d5759437eeb3137e4a05471ff0f4681c0254e81a (diff) | |
| download | frameworks_base-706113fa2a82e5b613b8555120025b8472ffcbf3.zip frameworks_base-706113fa2a82e5b613b8555120025b8472ffcbf3.tar.gz frameworks_base-706113fa2a82e5b613b8555120025b8472ffcbf3.tar.bz2 | |
Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b70d74a..025926e 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3335,7 +3335,9 @@ public final class Settings { */ public static final int LOCATION_MODE_SENSORS_ONLY = 1; /** - * Reduced power usage, such as limiting the number of GPS updates per hour. + * Reduced power usage, such as limiting the number of GPS updates per hour. Requests + * with {@link android.location.Criteria#POWER_HIGH} may be downgraded to + * {@link android.location.Criteria#POWER_MEDIUM}. */ public static final int LOCATION_MODE_BATTERY_SAVING = 2; /** @@ -4384,10 +4386,13 @@ public final class Settings { /** * Helper method for determining if a location provider is enabled. + * * @param cr the content resolver to use * @param provider the location provider to query * @return true if the provider is enabled - * @deprecated use {@link #getInt(ContentResolver, String)} and {@link #LOCATION_MODE} + * + * @deprecated use {@link #LOCATION_MODE} or + * {@link LocationManager#isProviderEnabled(String)} */ @Deprecated public static final boolean isLocationProviderEnabled(ContentResolver cr, String provider) { @@ -4400,8 +4405,8 @@ public final class Settings { * @param provider the location provider to query * @param userId the userId to query * @return true if the provider is enabled - * @deprecated use {@link #getIntForUser(ContentResolver, String, int, int)} and - * {@link #LOCATION_MODE} + * @deprecated use {@link #LOCATION_MODE} or + * {@link LocationManager#isProviderEnabled(String)} * @hide */ @Deprecated |