Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pankaj Kanwar
2017-10-15 04:03:46 +00:00
committed by Android (Google) Code Review
parent a354ec973d 1108564313
commit 7c18f52452
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -762,6 +762,18 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int"; 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}, * Determines whether conference calls are supported by a carrier. When {@code true},
* conference calling is supported, {@code false otherwise}. * conference calling is supported, {@code false otherwise}.
@@ -1697,6 +1709,7 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0); sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0);
sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0); sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);
sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100); 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.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);
sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true);