Merge "Create carrier config for NR enabled setting" am: c8d4118796

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346922

Change-Id: I1138f1156d0b4151ee3c968c52e6825ed16df9bb
This commit is contained in:
Sarah Chin
2020-06-22 23:31:11 +00:00
committed by Automerger Merge Worker

View File

@@ -1633,6 +1633,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.
*/
@@ -4117,6 +4123,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);