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

Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario."

Browse Source
This commit is contained in:
Treehugger Robot
2018-01-24 19:33:33 +00:00
committed by Gerrit Code Review
parent 71793be6bb f780837575
commit 7a481bde6d
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/DisconnectCause.java
View File

@@ -310,6 +310,13 @@ public class DisconnectCause {
* {@hide} * {@hide}
*/ */
public static final int DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 70; public static final int DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 70;
/**
* The network has reported that an alternative emergency number has been dialed, but the user
* must exit airplane mode to place the call.
*/
public static final int IMS_SIP_ALTERNATE_EMERGENCY_CALL = 71;
//********************************************************************************************* //*********************************************************************************************
// When adding a disconnect type: // When adding a disconnect type:
// 1) Update toString() with the newly added disconnect type. // 1) Update toString() with the newly added disconnect type.
@@ -462,6 +469,8 @@ public class DisconnectCause {
return "EMERGENCY_PERM_FAILURE"; return "EMERGENCY_PERM_FAILURE";
case NORMAL_UNSPECIFIED: case NORMAL_UNSPECIFIED:
return "NORMAL_UNSPECIFIED"; return "NORMAL_UNSPECIFIED";
case IMS_SIP_ALTERNATE_EMERGENCY_CALL:
return "IMS_SIP_ALTERNATE_EMERGENCY_CALL";
default: default:
return "INVALID: " + cause; return "INVALID: " + cause;
} }

7
telephony/java/com/android/ims/ImsReasonInfo.java
View File

@@ -384,6 +384,13 @@ public class ImsReasonInfo implements Parcelable {
/** Call/IMS registration is failed/dropped because of a network detach */ /** Call/IMS registration is failed/dropped because of a network detach */
public static final int CODE_NETWORK_DETACH = 1513; public static final int CODE_NETWORK_DETACH = 1513;
/**
* Call failed due to SIP code 380 (Alternative Service response) while dialing an "undetected
* emergency number". This scenario is important in some regions where the carrier network will
* identify other non-emergency help numbers (e.g. mountain rescue) when attempting to dial.
*/
public static final int CODE_SIP_ALTERNATE_EMERGENCY_CALL = 1514;
/* OEM specific error codes. To be used by OEMs when they don't want to /* OEM specific error codes. To be used by OEMs when they don't want to
reveal error code which would be replaced by ERROR_UNSPECIFIED */ reveal error code which would be replaced by ERROR_UNSPECIFIED */
public static final int CODE_OEM_CAUSE_1 = 0xf001; public static final int CODE_OEM_CAUSE_1 = 0xf001;