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

Merge "DO NOT MERGE New carrier config enhanced_4g_lte_title_variant_int" into pi-dev

Browse Source
This commit is contained in:
Meng Wang
2018-10-01 03:31:04 +00:00
committed by Android (Google) Code Review
parent b24da2ee82 efc342bfc3
commit 48186ba033
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1570,10 +1570,20 @@ public class CarrierConfigManager {
* When {@code false}, use default title for Enhanced 4G LTE Mode settings. * When {@code false}, use default title for Enhanced 4G LTE Mode settings.
* When {@code true}, use the variant. * When {@code true}, use the variant.
* @hide * @hide
* @deprecated use {@link #KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT}.
*/ */
@Deprecated
public static final String KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL = public static final String KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL =
"enhanced_4g_lte_title_variant_bool"; "enhanced_4g_lte_title_variant_bool";
/**
* The index indicates the carrier specified title string of Enahnce 4G LTE Mode settings.
* Default value is 0, which indicates the default title string.
* @hide
*/
public static final String KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT =
"enhanced_4g_lte_title_variant_int";
/** /**
* Indicates whether the carrier wants to notify the user when handover of an LTE video call to * Indicates whether the carrier wants to notify the user when handover of an LTE video call to
* WIFI fails. * WIFI fails.
@@ -2305,6 +2315,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null); sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false); sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false);
sDefaults.putInt(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 0);
sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);
sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null); sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false); sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);