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

am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev

Browse Source 
* commit '49b03c2374d035524908251113d27733219e9323':
  Add telephony.DisconnectCause for merged IMS call.
This commit is contained in:
Andrew Lee
2014-11-13 02:25:22 +00:00
committed by Android Git Automerger
parent be65ef8d00 49b03c2374
commit 38f99e55d5
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,11 +160,27 @@ public class DisconnectCause {
*/ */
public static final int OUTGOING_CANCELED = 44; public static final int OUTGOING_CANCELED = 44;
/**
* The call, which was an IMS call, disconnected because it merged with another call.
*/
public static final int IMS_MERGED_SUCCESSFULLY = 45;
//*********************************************************************************************
// When adding a disconnect type:
// 1) Please assign the new type the next id value below.
// 2) Increment the next id value below to a new value.
// 3) Update MAXIMUM_VALID_VALUE to the new disconnect type.
// 4) Update toString() with the newly added disconnect type.
// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
//
// NextId: 46
//*********************************************************************************************
/** Smallest valid value for call disconnect codes. */ /** Smallest valid value for call disconnect codes. */
public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED; public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;
/** Largest valid value for call disconnect codes. */ /** Largest valid value for call disconnect codes. */
public static final int MAXIMUM_VALID_VALUE = OUTGOING_CANCELED; public static final int MAXIMUM_VALID_VALUE = IMS_MERGED_SUCCESSFULLY;
/** Private constructor to avoid class instantiation. */ /** Private constructor to avoid class instantiation. */
private DisconnectCause() { private DisconnectCause() {
@@ -262,6 +278,8 @@ public class DisconnectCause {
return "OUTGOING_FAILURE"; return "OUTGOING_FAILURE";
case OUTGOING_CANCELED: case OUTGOING_CANCELED:
return "OUTGOING_CANCELED"; return "OUTGOING_CANCELED";
case IMS_MERGED_SUCCESSFULLY:
return "IMS_MERGED_SUCCESSFULLY";
default: default:
return "INVALID: " + cause; return "INVALID: " + cause;
} }