summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorJonathan Basseri <misterikkit@google.com>2015-04-23 22:35:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-23 22:35:10 +0000
commit48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b (patch)
tree3c02248c503c89f0968ecef5d14c89777adb2c83 /telephony/java
parent571bb54c73411af108fc0e1ec5305726303c835e (diff)
parentad5baab57e2b7c154f4bb5a1c7bab3ff3c952ede (diff)
downloadframeworks_base-48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b.zip
frameworks_base-48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b.tar.gz
frameworks_base-48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b.tar.bz2
Merge "Adding carrier variables to control certain network settings."
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index d103fbf..7d1a2fa 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -71,6 +71,11 @@ public class CarrierConfigManager {
public static final String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";
/**
+ * Control whether users can edit APNs in Settings.
+ */
+ public static final String BOOL_APN_EXPAND = "bool_apn_expand";
+
+ /**
* If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or RIL_RADIO_TECHNOLOGY_UNKNOWN:0
* this is the value that should be used instead. A configuration value of
* RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means there is no replacement value and that the default
@@ -121,6 +126,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(BOOL_CARRIER_VOLTE_PROVISIONED, false);
sDefaults.putBoolean(BOOL_CARRIER_VOLTE_TTY_SUPPORTED, true);
sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);
+ sDefaults.putBoolean(BOOL_APN_EXPAND, true);
sDefaults.putInt(INT_VOLTE_REPLACEMENT_RAT, 0);