diff options
| author | Junda Liu <junda@google.com> | 2014-11-12 00:05:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-12 00:05:20 +0000 |
| commit | 2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4 (patch) | |
| tree | f85361dc5a6f553de6cd8ab246d1af8461118a26 /core/java | |
| parent | 9114a845d9474bc2ecc807c3f195fe0c5314556c (diff) | |
| parent | bbdc1c0e044a505d5a200963319a683e4ef1f967 (diff) | |
| download | frameworks_base-2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4.zip frameworks_base-2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4.tar.gz frameworks_base-2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4.tar.bz2 | |
Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 88c3897..1f45f0a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6363,6 +6363,14 @@ public final class Settings { "preferred_network_mode"; /** + * Setting to 1 will hide carrier network settings. + * Default is 0. + * @hide + */ + public static final String HIDE_CARRIER_NETWORK_SETTINGS = + "hide_carrier_network_settings"; + + /** * Name of an application package to be debugged. */ public static final String DEBUG_APP = "debug_app"; |