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

Merge commit 'e593d0a' into merge_work

Browse Source 
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
This commit is contained in:
Prerepa Viswanadham
2015-04-10 15:58:10 -07:00
parent 3932bb4153 e593d0aec6
commit 57bf2a8a38
45 changed files with 1284 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,8 +221,14 @@ public final class Call {
*/
public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;
//**********************************************************************************************
// Next CAPABILITY value: 0x00080000
/**
* Call type can be modified for IMS call
* @hide
*/
public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000;
//******************************************************************************************
// Next CAPABILITY value: 0x00100000
//******************************************************************************************
private final Uri mHandle;
@@ -238,6 +244,7 @@ public final class Call {
private final int mVideoState;
private final StatusHints mStatusHints;
private final Bundle mExtras;
private final int mCallSubstate;
/**
* Whether the supplied capabilities supports the specified capability.
@@ -325,6 +332,9 @@ public final class Call {
if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
builder.append(" CAPABILITY_SPEED_UP_MT_AUDIO");
}
if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {
builder.append(" CAPABILITY_CAN_UPGRADE_TO_VIDEO");
}
builder.append("]");
return builder.toString();
}
@@ -430,6 +440,14 @@ public final class Call {
return mExtras;
}
/**
* @return The substate of the {@code Call}.
* @hide
*/
public int getCallSubstate() {
return mCallSubstate;
}
@Override
public boolean equals(Object o) {
if (o instanceof Details) {
@@ -448,7 +466,8 @@ public final class Call {
Objects.equals(mGatewayInfo, d.mGatewayInfo) &&
Objects.equals(mVideoState, d.mVideoState) &&
Objects.equals(mStatusHints, d.mStatusHints) &&
Objects.equals(mExtras, d.mExtras);
Objects.equals(mExtras, d.mExtras) &&
Objects.equals(mCallSubstate, d.mCallSubstate);
}
return false;
}
@@ -468,7 +487,8 @@ public final class Call {
Objects.hashCode(mGatewayInfo) +
Objects.hashCode(mVideoState) +
Objects.hashCode(mStatusHints) +
Objects.hashCode(mExtras);
Objects.hashCode(mExtras) +
Objects.hashCode(mCallSubstate);
}
/** {@hide} */
@@ -485,7 +505,8 @@ public final class Call {
GatewayInfo gatewayInfo,
int videoState,
StatusHints statusHints,
Bundle extras) {
Bundle extras,
int callSubstate) {
mHandle = handle;
mHandlePresentation = handlePresentation;
mCallerDisplayName = callerDisplayName;
@@ -499,6 +520,7 @@ public final class Call {
mVideoState = videoState;
mStatusHints = statusHints;
mExtras = extras;
mCallSubstate = callSubstate;
}
}
@@ -879,7 +901,8 @@ public final class Call {
parcelableCall.getGatewayInfo(),
parcelableCall.getVideoState(),
parcelableCall.getStatusHints(),
parcelableCall.getExtras());
parcelableCall.getExtras(),
parcelableCall.getCallSubstate());
boolean detailsChanged = !Objects.equals(mDetails, details);
if (detailsChanged) {
mDetails = details;