commit c69acaef0b31af922931461c11f075e436642fef
author Dianne Hackborn <hackbod@google.com> Thu Feb 02 15:17:16 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 02 15:17:16 2012 -0800
tree c5bd5ea3aab36f0b8ed540f8a0f4d36dd2ac8383
parent bc18f289073a47b1cbf84fcd3e3e79c9d34c0990
parent 895f99e9ca3500ad69e9ae8d1a8f28237075c7c7

Merge "New global setting for developer options."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 9e94a0d..b9453cc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17505,6 +17505,7 @@
     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";

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 207810c..375e5e4 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2482,6 +2482,11 @@
             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";