summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2012-02-02 11:49:12 -0800
committer Dianne Hackborn <hackbod@google.com> 2012-02-02 14:13:08 -0800
commit895f99e9ca3500ad69e9ae8d1a8f28237075c7c7 (patch)
tree9f21628d043cc3453ce97f6522369587287702e1
parent8ca8a69d5801ad4b809e7b9dbf53bd728820924b (diff)
New global setting for developer options.
Change-Id: I3f60538e9f858858501c5b063b0da97675d445a6
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/provider/Settings.java5
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 9e94a0d7d04e..b9453cc3b908 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17505,6 +17505,7 @@ package android.provider {
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String DATA_ROAMING = "data_roaming";
field public static final java.lang.String DEFAULT_INPUT_METHOD = "default_input_method";
+ field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";
field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 207810c89b92..375e5e4f6dc6 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2482,6 +2482,11 @@ public final class Settings {
Uri.parse("content://" + AUTHORITY + "/secure");
/**
+ * Whether user has enabled development settings.
+ */
+ public static final String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
+
+ /**
* Whether ADB is enabled.
*/
public static final String ADB_ENABLED = "adb_enabled";