drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 00de38a1 to master

Browse Source 
Change-Id: Ib1ac99ba7181ad79af94a04124380833bcb79a0c
This commit is contained in:
Tyler Gunn
2015-03-18 12:39:23 -07:00
parent ac1496a1c9 00de38a188
commit 96d6c40c71
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,16 +208,22 @@ public final class Call {
*/
public static final int CAPABILITY_WIFI = 0x00010000;
//******************************************************************************************
// Next CAPABILITY value: 0x00020000
//******************************************************************************************
/**
* Indicates that the current device callback number should be shown.
*
* @hide
*/
public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;
public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000;
/**
* Speed up audio setup for MT call.
* @hide
*/
public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;
//**********************************************************************************************
// Next CAPABILITY value: 0x00080000
//**********************************************************************************************
private final Uri mHandle;
private final int mHandlePresentation;
@ -316,6 +322,9 @@ public final class Call {
if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {
builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
}
if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO");
}
builder.append("]");
return builder.toString();
}

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

@ -173,18 +173,22 @@ public abstract class Connection implements IConferenceable {
*/
public static final int CAPABILITY_WIFI = 0x000010000;
//**********************************************************************************************
// Next CAPABILITY value: 0x00020000
//**********************************************************************************************
/**
* Indicates that the current device callback number should be shown.
*
* @hide
*/
public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;
public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000;
/**
* Speed up audio setup for MT call.
* @hide
*/
public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;
//**********************************************************************************************
// Next CAPABILITY value: 0x00080000
//**********************************************************************************************
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@ -287,6 +291,9 @@ public abstract class Connection implements IConferenceable {
if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {
builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
}
if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO");
}
builder.append("]");
return builder.toString();
}