Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Supported minimum aggregated bandwidth and roaming for 5G+"

Browse Source
This commit is contained in:
Treehugger Robot
2021-11-01 23:07:21 +00:00
committed by Gerrit Code Review
parent 9ea37fe982 eea7397d88
commit a0e2ccc173
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1878,6 +1878,20 @@ public class CarrierConfigManager {
public static final String KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT = public static final String KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT =
"lte_plus_threshold_bandwidth_khz_int"; "lte_plus_threshold_bandwidth_khz_int";
/**
* The combined channel bandwidth threshold (non-inclusive) in KHz required to display the
* NR advanced (i.e. 5G+) data icon. It is 0 by default, meaning minimum bandwidth check is
* not enabled. Other factors like bands or frequency can also determine whether the NR
* advanced data icon is shown or not.
*
* @see #KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY
* @see #KEY_NR_ADVANCED_CAPABLE_PCO_ID_INT
*
* @hide
*/
public static final String KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT =
"nr_advanced_threshold_bandwidth_khz_int";
/** /**
* The string is used to filter redundant string from PLMN Network Name that's supplied by * The string is used to filter redundant string from PLMN Network Name that's supplied by
* specific carrier. * specific carrier.
@@ -3542,6 +3556,17 @@ public class CarrierConfigManager {
public static final String KEY_NR_ADVANCED_CAPABLE_PCO_ID_INT = public static final String KEY_NR_ADVANCED_CAPABLE_PCO_ID_INT =
"nr_advanced_capable_pco_id_int"; "nr_advanced_capable_pco_id_int";
/**
* Enabled NR advanced (i.e. 5G+) icon while roaming. The default value is {@code true}, meaming
* the same NR advanced logic used for home network will be used for roaming network as well.
* Set this to {@code false} will disable NR advanced icon while the device is roaming,
* regardless meeting NR advanced criteria or not.
*
* @hide
*/
public static final String KEY_ENABLE_NR_ADVANCED_WHILE_ROAMING_BOOL =
"enable_nr_advanced_for_roaming_bool";
/** /**
* This configuration allows the framework to use user data communication to detect Idle state, * This configuration allows the framework to use user data communication to detect Idle state,
* and this is used on the 5G icon. * and this is used on the 5G icon.
@@ -5560,6 +5585,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING, ""); sDefaults.putString(KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING, "");
sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true); sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true);
sDefaults.putInt(KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT, 20000); sDefaults.putInt(KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT, 20000);
sDefaults.putInt(KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT, 0);
sDefaults.putIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, sDefaults.putIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
new int[]{CARRIER_NR_AVAILABILITY_NSA, CARRIER_NR_AVAILABILITY_SA}); new int[]{CARRIER_NR_AVAILABILITY_NSA, CARRIER_NR_AVAILABILITY_SA});
sDefaults.putBoolean(KEY_LTE_ENABLED_BOOL, true); sDefaults.putBoolean(KEY_LTE_ENABLED_BOOL, true);
@@ -5655,6 +5681,7 @@ public class CarrierConfigManager {
sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000); sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);
sDefaults.putIntArray(KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY, new int[0]); sDefaults.putIntArray(KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY, new int[0]);
sDefaults.putInt(KEY_NR_ADVANCED_CAPABLE_PCO_ID_INT, 0); sDefaults.putInt(KEY_NR_ADVANCED_CAPABLE_PCO_ID_INT, 0);
sDefaults.putBoolean(KEY_ENABLE_NR_ADVANCED_WHILE_ROAMING_BOOL, true);
sDefaults.putBoolean(KEY_LTE_ENDC_USING_USER_DATA_FOR_RRC_DETECTION_BOOL, false); sDefaults.putBoolean(KEY_LTE_ENDC_USING_USER_DATA_FOR_RRC_DETECTION_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false); sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false); sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false);