diff options
| author | Jonathan Basseri <misterikkit@google.com> | 2015-04-23 22:35:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-23 22:35:10 +0000 |
| commit | 48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b (patch) | |
| tree | 3c02248c503c89f0968ecef5d14c89777adb2c83 | |
| parent | 571bb54c73411af108fc0e1ec5305726303c835e (diff) | |
| parent | ad5baab57e2b7c154f4bb5a1c7bab3ff3c952ede (diff) | |
| download | frameworks_base-48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b.zip frameworks_base-48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b.tar.gz frameworks_base-48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b.tar.bz2 | |
Merge "Adding carrier variables to control certain network settings."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 8f94e49..bd9937e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30673,6 +30673,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 eef88e6..fd9b67b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32827,6 +32827,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 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); |