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
This commit is contained in:
Tyler Gunn
2016-07-01 20:23:15 +00:00
committed by Android (Google) Code Review
parent 2d7d1209de 2a3f997b02
commit 0babe967be
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: case CONNECTION_MANAGER_NOT_SUPPORTED:
code = "CONNECTION_MANAGER_NOT_SUPPORTED"; code = "CONNECTION_MANAGER_NOT_SUPPORTED";
break; break;
case CALL_PULLED:
code = "CALL_PULLED";
break;
case ANSWERED_ELSEWHERE:
code = "ANSWERED_ELSEWHERE";
break;
default: default:
code = "invalid code: " + mDisconnectCode; code = "invalid code: " + mDisconnectCode;
break; break;

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

@@ -200,6 +200,12 @@ public class DisconnectCause {
*/ */
public static final int CALL_PULLED = 51; 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: // When adding a disconnect type:
// 1) Please assign the new type the next id value below. // 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. // 4) Update toString() with the newly added disconnect type.
// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause. // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
// //
// NextId: 50 // NextId: 53
//********************************************************************************************* //*********************************************************************************************
/** 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 = VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED; public static final int MAXIMUM_VALID_VALUE = ANSWERED_ELSEWHERE;
/** Private constructor to avoid class instantiation. */ /** Private constructor to avoid class instantiation. */
private DisconnectCause() { private DisconnectCause() {
@@ -327,6 +333,8 @@ public class DisconnectCause {
return "VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED"; return "VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED";
case CALL_PULLED: case CALL_PULLED:
return "CALL_PULLED"; return "CALL_PULLED";
case ANSWERED_ELSEWHERE:
return "ANSWERED_ELSEWHERE";
default: default:
return "INVALID: " + cause; return "INVALID: " + cause;
} }