summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-05-13 23:45:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-13 23:45:23 +0000
commit67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc (patch)
tree1773bdd2e6e4951e5021fac86f4b10a89edbb632 /core/java/android/provider/Settings.java
parent55e6ad78a0a30f917b6f0c135fdf328ebafc68fb (diff)
parentf7e9cf4fb48ea80cbc5088204ac3f898109623f7 (diff)
downloadframeworks_base-67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc.zip
frameworks_base-67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc.tar.gz
frameworks_base-67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc.tar.bz2
Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
-rw-r--r--core/java/android/provider/Settings.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c514180..1f4020d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4133,7 +4133,10 @@ public final class Settings {
* LocationManager service for testing purposes during application development. These
* locations and status values override actual location and status information generated
* by network, gps, or other location providers.
+ *
+ * @deprecated This settings is not used anymore.
*/
+ @Deprecated
public static final String ALLOW_MOCK_LOCATION = "mock_location";
/**