From ad5baab57e2b7c154f4bb5a1c7bab3ff3c952ede Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Thu, 23 Apr 2015 13:36:04 -0700 Subject: [PATCH] Adding carrier variables to control certain network settings. Bug: 20270007 Change-Id: I4075c159e4fceb2e8a5bdda1261f8b2470455595 --- api/current.txt | 1 + api/system-current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/api/current.txt b/api/current.txt index d29bd78d6e974..cc3f065cde446 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30657,6 +30657,7 @@ package android.telephony { method public android.os.Bundle getConfigForSubId(int); method public void reloadCarrierConfigForSubId(int); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; + field public static final java.lang.String BOOL_APN_EXPAND = "bool_apn_expand"; field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available"; field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned"; field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported"; diff --git a/api/system-current.txt b/api/system-current.txt index d6242ae32347b..ecabaef94f88e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32811,6 +32811,7 @@ package android.telephony { method public void reloadCarrierConfigForSubId(int); method public void updateConfigForPhoneId(int, java.lang.String); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; + field public static final java.lang.String BOOL_APN_EXPAND = "bool_apn_expand"; field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available"; field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned"; field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index d103fbf8d9ab2..7d1a2fa9527e2 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -70,6 +70,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 @@ -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);