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

Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev

Browse Source
This commit is contained in:
Andrew Lee
2015-03-11 18:32:32 +00:00
committed by Android Partner Code Review
parent 52def6d1c8 5e9e8bb30e
commit 74050f58d5
2 changed files with 100 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,28 +141,42 @@ public final class Call {
public static final int CAPABILITY_MANAGE_CONFERENCE = 0x00000080; public static final int CAPABILITY_MANAGE_CONFERENCE = 0x00000080;
/** /**
* Local device supports video telephony. * Local device supports receiving video.
* @hide * @hide
*/ */
public static final int CAPABILITY_SUPPORTS_VT_LOCAL = 0x00000100; public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 0x00000100;
/** /**
* Remote device supports video telephony. * Local device supports transmitting video.
* @hide * @hide
*/ */
public static final int CAPABILITY_SUPPORTS_VT_REMOTE = 0x00000200; public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 0x00000200;
/** /**
* Call is using high definition audio. * Local device supports bidirectional video calling.
* @hide * @hide
*/ */
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400; public static final int CAPABILITY_SUPPORTS_VT_LOCAL =
CAPABILITY_SUPPORTS_VT_LOCAL_RX | CAPABILITY_SUPPORTS_VT_LOCAL_TX;
/** /**
* Call is using WIFI. * Remote device supports receiving video.
* @hide * @hide
*/ */
public static final int CAPABILITY_WIFI = 0x00000800; public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 0x00000400;
/**
* Remote device supports transmitting video.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 0x00000800;
/**
* Remote device supports bidirectional video calling.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_REMOTE =
CAPABILITY_SUPPORTS_VT_REMOTE_RX | CAPABILITY_SUPPORTS_VT_REMOTE_TX;
/** /**
* Call is able to be separated from its parent {@code Conference}, if any. * Call is able to be separated from its parent {@code Conference}, if any.
@@ -182,6 +196,22 @@ public final class Call {
*/ */
public static final int CAPABILITY_GENERIC_CONFERENCE = 0x00004000; public static final int CAPABILITY_GENERIC_CONFERENCE = 0x00004000;
/**
* Call is using high definition audio.
* @hide
*/
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00008000;
/**
* Call is using WIFI.
* @hide
*/
public static final int CAPABILITY_WIFI = 0x00010000;
//******************************************************************************************
// Next CAPABILITY value: 0x00020000
//******************************************************************************************
private final Uri mHandle; private final Uri mHandle;
private final int mHandlePresentation; private final int mHandlePresentation;
private final String mCallerDisplayName; private final String mCallerDisplayName;
@@ -249,9 +279,21 @@ public final class Call {
if (can(capabilities, CAPABILITY_MANAGE_CONFERENCE)) { if (can(capabilities, CAPABILITY_MANAGE_CONFERENCE)) {
builder.append(" CAPABILITY_MANAGE_CONFERENCE"); builder.append(" CAPABILITY_MANAGE_CONFERENCE");
} }
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_RX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_RX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_TX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_TX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) { if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) {
builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL"); builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL");
} }
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_RX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_RX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) { if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE"); builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");
} }

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

@@ -106,28 +106,42 @@ public abstract class Connection implements IConferenceable {
public static final int CAPABILITY_MANAGE_CONFERENCE = 0x00000080; public static final int CAPABILITY_MANAGE_CONFERENCE = 0x00000080;
/** /**
* Local device supports video telephony. * Local device supports receiving video.
* @hide * @hide
*/ */
public static final int CAPABILITY_SUPPORTS_VT_LOCAL = 0x00000100; public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 0x00000100;
/** /**
* Remote device supports video telephony. * Local device supports transmitting video.
* @hide * @hide
*/ */
public static final int CAPABILITY_SUPPORTS_VT_REMOTE = 0x00000200; public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 0x00000200;
/** /**
* Connection is using high definition audio. * Local device supports bidirectional video calling.
* @hide * @hide
*/ */
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400; public static final int CAPABILITY_SUPPORTS_VT_LOCAL =
CAPABILITY_SUPPORTS_VT_LOCAL_RX | CAPABILITY_SUPPORTS_VT_LOCAL_TX;
/** /**
* Connection is using WIFI. * Remote device supports receiving video.
* @hide * @hide
*/ */
public static final int CAPABILITY_WIFI = 0x00000800; public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 0x00000400;
/**
* Remote device supports transmitting video.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 0x00000800;
/**
* Remote device supports bidirectional video calling.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_REMOTE =
CAPABILITY_SUPPORTS_VT_REMOTE_RX | CAPABILITY_SUPPORTS_VT_REMOTE_TX;
/** /**
* Connection is able to be separated from its parent {@code Conference}, if any. * Connection is able to be separated from its parent {@code Conference}, if any.
@@ -147,6 +161,22 @@ public abstract class Connection implements IConferenceable {
*/ */
public static final int CAPABILITY_GENERIC_CONFERENCE = 0x00004000; public static final int CAPABILITY_GENERIC_CONFERENCE = 0x00004000;
/**
* Connection is using high definition audio.
* @hide
*/
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00008000;
/**
* Connection is using WIFI.
* @hide
*/
public static final int CAPABILITY_WIFI = 0x000010000;
//**********************************************************************************************
// Next CAPABILITY value: 0x00020000
//**********************************************************************************************
// Flag controlling whether PII is emitted into the logs // Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG); private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@@ -218,9 +248,21 @@ public abstract class Connection implements IConferenceable {
if (can(capabilities, CAPABILITY_MANAGE_CONFERENCE)) { if (can(capabilities, CAPABILITY_MANAGE_CONFERENCE)) {
builder.append(" CAPABILITY_MANAGE_CONFERENCE"); builder.append(" CAPABILITY_MANAGE_CONFERENCE");
} }
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_RX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_RX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_TX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_TX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) { if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) {
builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL"); builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL");
} }
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_RX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_RX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) { if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE"); builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");
} }