summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2010-01-26 11:36:41 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-26 11:36:41 -0800
commitfd0c2dda2dc77944bd0a94cedd88acba707804c8 (patch)
treefcb0d41ba8dc01f346e83851d0adec8662cb9568 /core/java
parent122b309481f5e606b9af4c8266d1dd75e5b1bc8c (diff)
parenta3d5e0c5e3d12b3f8d7f43acb0c170b5e5899876 (diff)
Merge "Unhide the secure setting for LocationProviderEnabled"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8172ac4af2a4..06bdf1f28d4e 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2977,8 +2977,6 @@ public final class Settings {
* @param cr the content resolver to use
* @param provider the location provider to query
* @return true if the provider is enabled
- *
- * @hide
*/
public static final boolean isLocationProviderEnabled(ContentResolver cr, String provider) {
String allowedProviders = Settings.Secure.getString(cr, LOCATION_PROVIDERS_ALLOWED);
@@ -2996,8 +2994,6 @@ public final class Settings {
* @param cr the content resolver to use
* @param provider the location provider to enable or disable
* @param enabled true if the provider should be enabled
- *
- * @hide
*/
public static final void setLocationProviderEnabled(ContentResolver cr,
String provider, boolean enabled) {