summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-06-16 23:11:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-16 23:11:32 +0000
commita11ffa64366e39899bcda7448e5b5ffe727bea48 (patch)
treebfe96f9a7e7a3b300de3f1e5975883a4eee50584 /core/java/android/provider/Settings.java
parente6ba94ce022a60b5225ee54cf2cc710633441d87 (diff)
parent297da6ffb996460cce8efcf8fa920ea54e99731d (diff)
downloadframeworks_base-a11ffa64366e39899bcda7448e5b5ffe727bea48.zip
frameworks_base-a11ffa64366e39899bcda7448e5b5ffe727bea48.tar.gz
frameworks_base-a11ffa64366e39899bcda7448e5b5ffe727bea48.tar.bz2
Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
-rw-r--r--core/java/android/provider/Settings.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index dfd72c2..3e9c9de 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7232,13 +7232,6 @@ public final class Settings {
"preferred_network_mode";
/**
- * Setting to 1 will hide carrier network settings.
- * Default is 0.
- */
- 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";