From 8366bcb8b811958d1fab9b66111aabf8fe56f7bf Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Wed, 28 Feb 2018 14:57:54 -0800 Subject: [PATCH] Expose Carrier Name Override CarrierConfig Values These CarrierConfig values are needed for a CC app to override the SPN dynamically. Since Carrier names are very complicated, it's extra important that these values be exposed so that we can properly enforce correct behavior through CTS. Bug: 73734601 Test: compilation (no functional change) Change-Id: I26dab1bd32d1d5273f707a37026cffca7fd639a3 --- api/current.txt | 2 ++ .../java/android/telephony/CarrierConfigManager.java | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 8df028cd9c4c4..f911f4ffa1bb3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40089,6 +40089,8 @@ package android.telephony { field public static final java.lang.String KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING = "carrier_instant_lettering_escaped_chars_string"; field public static final java.lang.String KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING = "carrier_instant_lettering_invalid_chars_string"; field public static final java.lang.String KEY_CARRIER_INSTANT_LETTERING_LENGTH_LIMIT_INT = "carrier_instant_lettering_length_limit_int"; + field public static final java.lang.String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool"; + field public static final java.lang.String KEY_CARRIER_NAME_STRING = "carrier_name_string"; field public static final java.lang.String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool"; field public static final java.lang.String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool"; field public static final java.lang.String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index de75ac491f8d2..63763c9915a85 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -991,8 +991,13 @@ public class CarrierConfigManager { "wfc_emergency_address_carrier_app_string"; /** - * Boolean to decide whether to use #KEY_CARRIER_NAME_STRING from CarrierConfig app. - * @hide + * Unconditionally override the carrier name string using #KEY_CARRIER_NAME_STRING. + * + * If true, then the carrier display name will be #KEY_CARRIER_NAME_STRING, unconditionally. + * + *

If false, then the override will be performed conditionally and the + * #KEY_CARRIER_NAME_STRING will have the lowest-precedence; it will only be used in the event + * that the name string would otherwise be empty, allowing it to serve as a last-resort. */ public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool"; @@ -1000,7 +1005,6 @@ public class CarrierConfigManager { * String to identify carrier name in CarrierConfig app. This string overrides SPN if * #KEY_CARRIER_NAME_OVERRIDE_BOOL is true; otherwise, it will be used if its value is provided * and SPN is unavailable - * @hide */ public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";