Merge "IMS: Add support in frameworks for call deflection feature" am: ba0f9d2973 am: f39bef4801

am: ac48eed9c0

Change-Id: I4695aca7d886f37341672ea5815770e3ccdf7a51
This commit is contained in:
Pooja Jain
2018-02-08 02:15:56 +00:00
committed by android-build-merger
13 changed files with 138 additions and 2 deletions

View File

@@ -328,8 +328,11 @@ public abstract class Connection extends Conferenceable {
*/
public static final int CAPABILITY_CAN_PULL_CALL = 0x01000000;
/** Call supports the deflect feature. */
public static final int CAPABILITY_SUPPORT_DEFLECT = 0x02000000;
//**********************************************************************************************
// Next CAPABILITY value: 0x02000000
// Next CAPABILITY value: 0x04000000
//**********************************************************************************************
/**
@@ -726,6 +729,9 @@ public abstract class Connection extends Conferenceable {
if (can(capabilities, CAPABILITY_CAN_PULL_CALL)) {
builder.append(isLong ? " CAPABILITY_CAN_PULL_CALL" : " pull");
}
if (can(capabilities, CAPABILITY_SUPPORT_DEFLECT)) {
builder.append(isLong ? " CAPABILITY_SUPPORT_DEFLECT" : " sup_def");
}
builder.append("]");
return builder.toString();
@@ -2750,6 +2756,12 @@ public abstract class Connection extends Conferenceable {
onAnswer(VideoProfile.STATE_AUDIO_ONLY);
}
/**
* Notifies this Connection, which is in {@link #STATE_RINGING}, of
* a request to deflect.
*/
public void onDeflect(Uri address) {}
/**
* Notifies this Connection, which is in {@link #STATE_RINGING}, of
* a request to reject.