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

resolve merge conflicts of bcb17eb to m-wireless-dev.

Browse Source 
Change-Id: Ic8211fb14caec993c8e38c790006577493f7a607
This commit is contained in:
Tyler Gunn
2015-03-18 13:09:14 -07:00
parent f9296808e9 bcb17eb7a9
commit d11a31561e
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,7 @@ public final class Call {
* Call is able to be individually disconnected when in a {@code Conference}.
*/
public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 0x00002000;
/**
* Whether the call is a generic conference, where we do not know the precise state of
* participants in the conference (eg. on CDMA).
@ -217,7 +217,17 @@ public final class Call {
*
* @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 +326,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_MT_AUDIO");
}
builder.append("]");
return builder.toString();
}

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

@ -171,20 +171,24 @@ public abstract class Connection implements IConferenceable {
* Connection is using WIFI.
* @hide
*/
public static final int CAPABILITY_WIFI = 0x000010000;
//**********************************************************************************************
// Next CAPABILITY value: 0x00020000
//**********************************************************************************************
public static final int CAPABILITY_WIFI = 0x00010000;
/**
* 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_MT_AUDIO");
}
builder.append("]");
return builder.toString();
}