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

Merge \"Telephony multi-endpoint disconnect causes.\" into nyc-mr1-dev

Browse Source 
am: 0babe967be

Change-Id: Ic25889f342d388368f2f9122c706ebc3bce764bd
This commit is contained in:
Tyler Gunn
2016-07-01 20:39:19 +00:00
committed by android-build-merger
parent 43c250e9b2 0babe967be
commit d3b6092a05
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/DisconnectCause.java
View File

@@ -275,6 +275,12 @@ public final class DisconnectCause implements Parcelable {
case CONNECTION_MANAGER_NOT_SUPPORTED:
code = "CONNECTION_MANAGER_NOT_SUPPORTED";
break;
case CALL_PULLED:
code = "CALL_PULLED";
break;
case ANSWERED_ELSEWHERE:
code = "ANSWERED_ELSEWHERE";
break;
default:
code = "invalid code: " + mDisconnectCode;
break;

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

@@ -200,6 +200,12 @@ public class DisconnectCause {
*/
public static final int CALL_PULLED = 51;
/**
* The call was terminated because it was answered on another device.
* {@hide}
*/
public static final int ANSWERED_ELSEWHERE = 52;
//*********************************************************************************************
// When adding a disconnect type:
// 1) Please assign the new type the next id value below.
@@ -208,14 +214,14 @@ public class DisconnectCause {
// 4) Update toString() with the newly added disconnect type.
// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
//
// NextId: 50
// NextId: 53
//*********************************************************************************************
/** Smallest valid value for call disconnect codes. */
public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;
/** Largest valid value for call disconnect codes. */
public static final int MAXIMUM_VALID_VALUE = VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED;
public static final int MAXIMUM_VALID_VALUE = ANSWERED_ELSEWHERE;
/** Private constructor to avoid class instantiation. */
private DisconnectCause() {
@@ -327,6 +333,8 @@ public class DisconnectCause {
return "VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED";
case CALL_PULLED:
return "CALL_PULLED";
case ANSWERED_ELSEWHERE:
return "ANSWERED_ELSEWHERE";
default:
return "INVALID: " + cause;
}