From a873153927373db3068583a19bb093d60712ff18 Mon Sep 17 00:00:00 2001 From: clownshen Date: Fri, 28 Sep 2018 16:17:53 +0800 Subject: [PATCH] New carrier config enhanced_4g_lte_title_variant_int Carriers requires that changing the title as "4G Calling" for Enhanced 4G LTE Mode settings. Using int as index of string array would more flexible for different carriers Bug: 112676117 Test: Manual test, setting config to 0, 1 or -1 to change the index for verifying different variant title of Enhanced 4G LTE Mode settings. Change-Id: I5ce96969337bc291dea98d5a7b01e3c182926bd9 --- .../java/android/telephony/CarrierConfigManager.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index d8743bcfd21d9..0691c09bd0495 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1625,10 +1625,20 @@ public class CarrierConfigManager { * When {@code false}, use default title for Enhanced 4G LTE Mode settings. * When {@code true}, use the variant. * @hide + * @deprecated use {@link #KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT}. */ + @Deprecated public static final String KEY_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 * WIFI fails. @@ -2411,6 +2421,7 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null); 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.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null); sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);