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

Commit 8dc69deb authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Add Prefix per Carrier requirement" am: 592e9abb 

am: c9da35e2

Change-Id: I1bd9b341e5f7ac2d512e3a22ecd0a3a8af2b69a8
parents 89a9462b c9da35e2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42200,6 +42200,7 @@ package android.telephony { 
    field public static final String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";

    field public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool";

    field public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool";

    field public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY = "emergency_number_prefix_string_array";

    field public static final String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final String KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL = "enhanced_4g_lte_on_by_default_bool";

    field public static final String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+13 −0
Original line number Diff line number Diff line
@@ -2454,6 +2454,18 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG =

            "opportunistic_network_data_switch_hysteresis_time_long";



    /**

     * Indicates zero or more emergency number prefix(es), because some carrier requires

     * if users dial an emergency number address with a specific prefix, the combination of the

     * prefix and the address is also a valid emergency number to dial. For example, an emergency

     * number prefix is 318, and the emergency number is 911. Both 318911 and 911 can be dialed by

     * users for emergency call. An empty array of string indicates that current carrier does not

     * have this requirement.

     */

    public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY =

            "emergency_number_prefix_string_array";



    /**

     * Determines whether the carrier wants to cancel the cs reject notification automatically

     * when the voice registration state changes.
@@ -2888,6 +2900,7 @@ public class CarrierConfigManager { 
                new int[] {

                        1 /* Roaming Indicator Off */

                });

        sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]);

        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

                "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");

        sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);