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

Commit 5c0982c6 authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by android-build-merger
Browse files

Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev 

am: 7c18f524

Change-Id: I12c3b3e3a0d4ad4919df5daeb07367f6197ffa93
parents b5a80794 7c18f524

telephony/java/android/telephony/CarrierConfigManager.java

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

    public static final String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";



    /**

     * Some carriers will send call forwarding responses for voicemail in a format that is not 3gpp

     * compliant, which causes issues during parsing. This causes the

     * {@link com.android.internal.telephony.CallForwardInfo#number} to contain non-numerical

     * characters instead of a number.

     *

     * If true, we will detect the non-numerical characters and replace them with "Voicemail".

     * @hide

     */

    public static final String KEY_CALL_FORWARDING_MAP_NON_NUMBER_TO_VOICEMAIL_BOOL =

            "call_forwarding_map_non_number_to_voicemail_bool";



    /**

     * Determines whether conference calls are supported by a carrier.  When {@code true},

     * conference calling is supported, {@code false otherwise}.
@@ -1712,6 +1724,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0);

        sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);

        sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_MAP_NON_NUMBER_TO_VOICEMAIL_BOOL, false);

        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true);