From ea9d40e140b34fc71502b3e656ac83274dfc6cf4 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Wed, 12 Aug 2020 19:38:02 -0700 Subject: Add minimum bandwidth config for showing LTE+ data icon Only show the LTE+ icon if the combined channel bandwidth is greater than the valued defined. By default, the value is 20 MHz, and if there is no limit then the value should be 0. Test: atest NetworkTypeControllerTest Bug: 160873305 Change-Id: I4068860c5798f921fc198c095ba9b8f84ae5663b --- telephony/java/android/telephony/CarrierConfigManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 52f1e37e69f4..5d79775f686e 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1641,6 +1641,15 @@ public class CarrierConfigManager { public static final String KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL = "hide_lte_plus_data_icon_bool"; + /** + * The combined channel bandwidth threshold (non-inclusive) in KHz required to display the + * LTE+ data icon. It is 20000 by default, meaning the LTE+ icon will be shown if the device is + * using carrier aggregation and the combined channel bandwidth is strictly greater than 20 MHz. + * @hide + */ + public static final String KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT = + "lte_plus_threshold_bandwidth_khz_int"; + /** * The string is used to filter redundant string from PLMN Network Name that's supplied by * specific carrier. @@ -4211,6 +4220,7 @@ public class CarrierConfigManager { sDefaults.putString(KEY_OPERATOR_NAME_FILTER_PATTERN_STRING, ""); sDefaults.putString(KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING, ""); sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true); + sDefaults.putInt(KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT, 20000); sDefaults.putBoolean(KEY_NR_ENABLED_BOOL, true); sDefaults.putBoolean(KEY_LTE_ENABLED_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_TDSCDMA_BOOL, false); -- cgit v1.2.3-59-g8ed1b