From d5759437eeb3137e4a05471ff0f4681c0254e81a Mon Sep 17 00:00:00 2001 From: Tom O'Neill Date: Wed, 11 Sep 2013 11:03:03 -0700 Subject: Improve some javadoc related to isProviderEnabled() apis - LocationManager.isProviderEnabled() no longer throws SecurityException: the caller could already circumvent the permission check by calling Secure.isLocationProviderEnabled() Change-Id: I5abd04264299671ed35ce4594b5be46d86378767 --- core/java/android/provider/Settings.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1a80818..6786d49 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3333,7 +3333,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; /** @@ -4382,10 +4384,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) { @@ -4398,8 +4403,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 -- cgit v1.1