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

Commit 1b637fe1 authored by Tyler Gunn's avatar Tyler Gunn Committed by Gerrit Code Review
Browse files

Merge "Format incoming call numbers with the national format for Japan"

parents 34bc8d2a e8e1ed69

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -3457,6 +3457,15 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_CERTIFICATE_STRING_ARRAY =

            "carrier_certificate_string_array";



    /**

     * Flag specifying whether the incoming call number should be formatted to national number

     * for Japan. @return {@code true} convert to the national format, {@code false} otherwise.

     * e.g. "+819012345678" -> "09012345678"

     * @hide

     */

    public static final String KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL =

            "format_incoming_number_to_national_for_jp_bool";



    /**

     * DisconnectCause array to play busy tone. Value should be array of

     * {@link android.telephony.DisconnectCause}.
@@ -3983,6 +3992,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);

        sDefaults.putAll(Ims.getDefaults());

        sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null);

         sDefaults.putBoolean(KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL, false);

        sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,

                new int[] {4 /* BUSY */});

        sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);