Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b3b84a authored by nharold's avatar nharold Committed by android-build-merger
Browse files

Merge "Expose Carrier Name Override CarrierConfig Values" 

am: a60e42cc

Change-Id: I38b27197171009958ed362a83a119b9de3af2adf
parents 3bcb6da7 a60e42cc

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

telephony/java/android/telephony/CarrierConfigManager.java

+7 −3
Original line number Diff line number Diff line
@@ -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.

     *

     * <p>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";