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

Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release"

Browse Source
This commit is contained in:
Vinit Deshpande
2015-04-16 02:36:02 +00:00
committed by Android (Google) Code Review
parent 7400df9487 80047faad9
commit cb43ebb360
33 changed files with 2007 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telecomm/java/android/telecom/Connection.java
View File

@@ -184,13 +184,20 @@ public abstract class Connection implements IConferenceable {
public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;
/**
* Call type can be modified for IMS call
* Call can be upgraded to a video call.
* @hide
*/
public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000;
/**
* For video calls, indicates whether the outgoing video for the call can be paused using
* the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
* @hide
*/
public static final int CAPABILITY_CAN_PAUSE_VIDEO = 0x00100000;
//**********************************************************************************************
// Next CAPABILITY value: 0x00100000
// Next CAPABILITY value: 0x00200000
//**********************************************************************************************
/**
@@ -342,6 +349,9 @@ public abstract class Connection implements IConferenceable {
if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {
builder.append(" CAPABILITY_CAN_UPGRADE_TO_VIDEO");
}
if (can(capabilities, CAPABILITY_CAN_PAUSE_VIDEO)) {
builder.append(" CAPABILITY_CAN_PAUSE_VIDEO");
}
builder.append("]");
return builder.toString();
}