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

Merge "Cleanup of Video Call pause functionality." into m-wireless-dev

Browse Source
This commit is contained in:
Tyler Gunn
2015-04-09 02:06:22 +00:00
committed by Android Partner Code Review
parent e593d0aec6 b5e0cfb24e
commit db8784e28a
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
telecomm/java/android/telecom/Call.java
View File

@@ -221,14 +221,21 @@ public final class Call {
*/ */
public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000; 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 * @hide
*/ */
public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000; 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
//****************************************************************************************** //******************************************************************************************
private final Uri mHandle; private final Uri mHandle;
@@ -335,6 +342,9 @@ public final class Call {
if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) { if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {
builder.append(" 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("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }

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

@@ -187,13 +187,20 @@ public abstract class Connection implements IConferenceable {
public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000; 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 * @hide
*/ */
public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000; 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
//********************************************************************************************** //**********************************************************************************************
/** /**
@@ -345,6 +352,9 @@ public abstract class Connection implements IConferenceable {
if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) { if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {
builder.append(" 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("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }