Merge "Create carrier config for NR enabled setting" into rvc-dev

This commit is contained in:
Sarah Chin
2020-05-15 18:47:12 +00:00
committed by Android (Google) Code Review

View File

@@ -1631,6 +1631,12 @@ public class CarrierConfigManager {
public static final String KEY_SHOW_PRECISE_FAILED_CAUSE_BOOL =
"show_precise_failed_cause_bool";
/**
* Boolean to decide whether NR is enabled.
* @hide
*/
public static final String KEY_NR_ENABLED_BOOL = "nr_enabled_bool";
/**
* Boolean to decide whether LTE is enabled.
*/
@@ -4139,6 +4145,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.putBoolean(KEY_NR_ENABLED_BOOL, true);
sDefaults.putBoolean(KEY_LTE_ENABLED_BOOL, true);
sDefaults.putBoolean(KEY_SUPPORT_TDSCDMA_BOOL, false);
sDefaults.putStringArray(KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY, null);