summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2014-11-07 11:18:02 -0800
committerJunda Liu <junda@google.com>2014-11-07 12:11:52 -0800
commitbbdc1c0e044a505d5a200963319a683e4ef1f967 (patch)
treed93cfcef8980fe13cb87a9e1c53c7ba1b2caaa06 /core
parentee990413b51b41e4fe8940cba703bdfb56a12018 (diff)
downloadframeworks_base-bbdc1c0e044a505d5a200963319a683e4ef1f967.zip
frameworks_base-bbdc1c0e044a505d5a200963319a683e4ef1f967.tar.gz
frameworks_base-bbdc1c0e044a505d5a200963319a683e4ef1f967.tar.bz2
Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
Also remove hidden APIs to get/set the preference. Bug: b/17673255 Change-Id: I8957b0380bf617c953f6665cbfdcc77c3be78411
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a165279..4eeb852 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6369,6 +6369,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";