diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-02-02 15:17:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-02 15:17:16 -0800 |
| commit | c69acaef0b31af922931461c11f075e436642fef (patch) | |
| tree | c5bd5ea3aab36f0b8ed540f8a0f4d36dd2ac8383 | |
| parent | bc18f289073a47b1cbf84fcd3e3e79c9d34c0990 (diff) | |
| parent | 895f99e9ca3500ad69e9ae8d1a8f28237075c7c7 (diff) | |
| download | frameworks_base-c69acaef0b31af922931461c11f075e436642fef.zip frameworks_base-c69acaef0b31af922931461c11f075e436642fef.tar.gz frameworks_base-c69acaef0b31af922931461c11f075e436642fef.tar.bz2 | |
Merge "New global setting for developer options."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 5 |
2 files changed, 6 insertions, 0 deletions
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 @@ 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 207810c..375e5e4 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"; |