diff --git a/api/current.txt b/api/current.txt index df2e5bc5bcf72..04e4588179962 100644 --- a/api/current.txt +++ b/api/current.txt @@ -42234,6 +42234,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 96eb23d88b1fb..8da0543f83f04 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1000,8 +1000,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"; @@ -1009,7 +1014,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";