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

Add extras to Connections/Calls. (1/3)

Browse Source 
Two major changes:
1) Add the notion of extras to a Connection.  These extras will be
parceled through to InCallService as Call.getExtras()
2) The previously existing Call.getExtras() has been renamed to
getIntentExtras(). This name better describes the fact that these
particular extras are from the original CALL or INCOMING_CALL intents.

Change-Id: I08c1baf4f08d54757f98012f0c08b423a707c53d
This commit is contained in:
Santos Cordon
2015-05-27 17:21:45 -07:00
parent 6ffab1bd65
commit 6b7f955c2d
15 changed files with 269 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,6 +253,7 @@ public final class Call {
private final int mVideoState;
private final StatusHints mStatusHints;
private final Bundle mExtras;
private final Bundle mIntentExtras;
/**
* Whether the supplied capabilities supports the specified capability.
@ -480,12 +481,19 @@ public final class Call {
}
/**
* @return A bundle extras to pass with the call
* @return The extras associated with this call.
*/
public Bundle getExtras() {
return mExtras;
}
/**
* @return The extras used with the original intent to place this call.
*/
public Bundle getIntentExtras() {
return mIntentExtras;
}
@Override
public boolean equals(Object o) {
if (o instanceof Details) {
@ -504,7 +512,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(mIntentExtras, d.mIntentExtras);
}
return false;
}
@ -524,7 +533,8 @@ public final class Call {
Objects.hashCode(mGatewayInfo) +
Objects.hashCode(mVideoState) +
Objects.hashCode(mStatusHints) +
Objects.hashCode(mExtras);
Objects.hashCode(mExtras) +
Objects.hashCode(mIntentExtras);
}
/** {@hide} */
@ -541,7 +551,8 @@ public final class Call {
GatewayInfo gatewayInfo,
int videoState,
StatusHints statusHints,
Bundle extras) {
Bundle extras,
Bundle intentExtras) {
mHandle = handle;
mHandlePresentation = handlePresentation;
mCallerDisplayName = callerDisplayName;
@ -555,6 +566,7 @@ public final class Call {
mVideoState = videoState;
mStatusHints = statusHints;
mExtras = extras;
mIntentExtras = intentExtras;
}
}
@ -986,7 +998,8 @@ public final class Call {
parcelableCall.getGatewayInfo(),
parcelableCall.getVideoState(),
parcelableCall.getStatusHints(),
parcelableCall.getExtras());
parcelableCall.getExtras(),
parcelableCall.getIntentExtras());
boolean detailsChanged = !Objects.equals(mDetails, details);
if (detailsChanged) {
mDetails = details;