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

Merge "IMS: Add support for IMS Explicit call transfer" am: 12f7f43ec8 am: 4c0cd62311 am: f65d00890f

Browse Source 
Change-Id: Ic8231acd8330c91998f0cb479a7a6fbe3ea5bda1
This commit is contained in:
Automerger Merge Worker
2020-02-19 23:19:00 +00:00
parent e58877eacd f65d00890f
commit 0a04056d35
13 changed files with 377 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
telecomm/java/android/telecom/Call.java Normal file → Executable file
View File

@@ -465,8 +465,27 @@ public final class Call {
* @hide
*/
public static final int CAPABILITY_ADD_PARTICIPANT = 0x02000000;
/**
* When set for a call, indicates that this {@code Call} can be transferred to another
* number.
* Call supports the blind and assured call transfer feature.
*
* @hide
*/
public static final int CAPABILITY_TRANSFER = 0x04000000;
/**
* When set for a call, indicates that this {@code Call} can be transferred to another
* ongoing call.
* Call supports the consultative call transfer feature.
*
* @hide
*/
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x08000000;
//******************************************************************************************
// Next CAPABILITY value: 0x04000000
// Next CAPABILITY value: 0x10000000
//******************************************************************************************
/**
@@ -699,6 +718,12 @@ public final class Call {
if (can(capabilities, CAPABILITY_ADD_PARTICIPANT)) {
builder.append(" CAPABILITY_ADD_PARTICIPANT");
}
if (can(capabilities, CAPABILITY_TRANSFER)) {
builder.append(" CAPABILITY_TRANSFER");
}
if (can(capabilities, CAPABILITY_TRANSFER_CONSULTATIVE)) {
builder.append(" CAPABILITY_TRANSFER_CONSULTATIVE");
}
builder.append("]");
return builder.toString();
}
@@ -1563,6 +1588,30 @@ public final class Call {
mInCallAdapter.rejectCall(mTelecomCallId, rejectReason);
}
/**
* Instructs this {@code Call} to be transferred to another number.
*
* @param targetNumber The address to which the call will be transferred.
* @param isConfirmationRequired if {@code true} it will initiate ASSURED transfer,
* if {@code false}, it will initiate BLIND transfer.
*
* @hide
*/
public void transfer(@NonNull Uri targetNumber, boolean isConfirmationRequired) {
mInCallAdapter.transferCall(mTelecomCallId, targetNumber, isConfirmationRequired);
}
/**
* Instructs this {@code Call} to be transferred to another ongoing call.
* This will initiate CONSULTATIVE transfer.
* @param toCall The other ongoing {@code Call} to which this call will be transferred.
*
* @hide
*/
public void transfer(@NonNull android.telecom.Call toCall) {
mInCallAdapter.transferCall(mTelecomCallId, toCall.mTelecomCallId);
}
/**
* Instructs this {@code Call} to disconnect.
*/

46
telecomm/java/android/telecom/Connection.java Normal file → Executable file
View File

@@ -387,8 +387,25 @@ public abstract class Connection extends Conferenceable {
* @hide
*/
public static final int CAPABILITY_ADD_PARTICIPANT = 0x04000000;
/**
* Indicates that this {@code Connection} can be transferred to another
* number.
* Connection supports the blind and assured call transfer feature.
* @hide
*/
public static final int CAPABILITY_TRANSFER = 0x08000000;
/**
* Indicates that this {@code Connection} can be transferred to another
* ongoing {@code Connection}.
* Connection supports the consultative call transfer feature.
* @hide
*/
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x10000000;
//**********************************************************************************************
// Next CAPABILITY value: 0x08000000
// Next CAPABILITY value: 0x20000000
//**********************************************************************************************
/**
@@ -967,6 +984,13 @@ public abstract class Connection extends Conferenceable {
if ((capabilities & CAPABILITY_ADD_PARTICIPANT) == CAPABILITY_ADD_PARTICIPANT) {
builder.append(isLong ? " CAPABILITY_ADD_PARTICIPANT" : " add_participant");
}
if ((capabilities & CAPABILITY_TRANSFER) == CAPABILITY_TRANSFER) {
builder.append(isLong ? " CAPABILITY_TRANSFER" : " sup_trans");
}
if ((capabilities & CAPABILITY_TRANSFER_CONSULTATIVE)
== CAPABILITY_TRANSFER_CONSULTATIVE) {
builder.append(isLong ? " CAPABILITY_TRANSFER_CONSULTATIVE" : " sup_cTrans");
}
builder.append("]");
return builder.toString();
}
@@ -3091,6 +3115,26 @@ public abstract class Connection extends Conferenceable {
*/
public void onReject(String replyMessage) {}
/**
* Notifies this Connection, a request to transfer to a target number.
* @param number the number to transfer this {@link Connection} to.
* @param isConfirmationRequired when {@code true}, the {@link ConnectionService}
* should wait until the transfer has successfully completed before disconnecting
* the current {@link Connection}.
* When {@code false}, the {@link ConnectionService} should signal the network to
* perform the transfer, but should immediately disconnect the call regardless of
* the outcome of the transfer.
* @hide
*/
public void onTransfer(@NonNull Uri number, boolean isConfirmationRequired) {}
/**
* Notifies this Connection, a request to transfer to another Connection.
* @param otherConnection the {@link Connection} to transfer this call to.
* @hide
*/
public void onTransfer(@NonNull Connection otherConnection) {}
/**
* Notifies this Connection of a request to silence the ringer.
* <p>

72
telecomm/java/android/telecom/ConnectionService.java Normal file → Executable file
View File

@@ -128,6 +128,8 @@ public abstract class ConnectionService extends Service {
private static final String SESSION_ANSWER = "CS.an";
private static final String SESSION_ANSWER_VIDEO = "CS.anV";
private static final String SESSION_DEFLECT = "CS.def";
private static final String SESSION_TRANSFER = "CS.trans";
private static final String SESSION_CONSULTATIVE_TRANSFER = "CS.cTrans";
private static final String SESSION_REJECT = "CS.r";
private static final String SESSION_REJECT_MESSAGE = "CS.rWM";
private static final String SESSION_SILENCE = "CS.s";
@@ -196,6 +198,8 @@ public abstract class ConnectionService extends Service {
private static final int MSG_CREATE_CONFERENCE_FAILED = 37;
private static final int MSG_REJECT_WITH_REASON = 38;
private static final int MSG_ADD_PARTICIPANT = 39;
private static final int MSG_EXPLICIT_CALL_TRANSFER = 40;
private static final int MSG_EXPLICIT_CALL_TRANSFER_CONSULTATIVE = 41;
private static Connection sNullConnection;
@@ -480,6 +484,38 @@ public abstract class ConnectionService extends Service {
}
}
@Override
public void transfer(@NonNull String callId, @NonNull Uri number,
boolean isConfirmationRequired, Session.Info sessionInfo) {
Log.startSession(sessionInfo, SESSION_TRANSFER);
try {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
args.arg2 = number;
args.argi1 = isConfirmationRequired ? 1 : 0;
args.arg3 = Log.createSubsession();
mHandler.obtainMessage(MSG_EXPLICIT_CALL_TRANSFER, args).sendToTarget();
} finally {
Log.endSession();
}
}
@Override
public void consultativeTransfer(@NonNull String callId, @NonNull String otherCallId,
Session.Info sessionInfo) {
Log.startSession(sessionInfo, SESSION_CONSULTATIVE_TRANSFER);
try {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
args.arg2 = otherCallId;
args.arg3 = Log.createSubsession();
mHandler.obtainMessage(
MSG_EXPLICIT_CALL_TRANSFER_CONSULTATIVE, args).sendToTarget();
} finally {
Log.endSession();
}
}
@Override
public void silence(String callId, Session.Info sessionInfo) {
Log.startSession(sessionInfo, SESSION_SILENCE);
@@ -1108,6 +1144,30 @@ public abstract class ConnectionService extends Service {
}
break;
}
case MSG_EXPLICIT_CALL_TRANSFER: {
SomeArgs args = (SomeArgs) msg.obj;
Log.continueSession((Session) args.arg3, SESSION_HANDLER + SESSION_TRANSFER);
try {
final boolean isConfirmationRequired = args.argi1 == 1;
transfer((String) args.arg1, (Uri) args.arg2, isConfirmationRequired);
} finally {
args.recycle();
Log.endSession();
}
break;
}
case MSG_EXPLICIT_CALL_TRANSFER_CONSULTATIVE: {
SomeArgs args = (SomeArgs) msg.obj;
Log.continueSession(
(Session) args.arg3, SESSION_HANDLER + SESSION_CONSULTATIVE_TRANSFER);
try {
consultativeTransfer((String) args.arg1, (String) args.arg2);
} finally {
args.recycle();
Log.endSession();
}
break;
}
case MSG_DISCONNECT: {
SomeArgs args = (SomeArgs) msg.obj;
Log.continueSession((Session) args.arg2, SESSION_HANDLER + SESSION_DISCONNECT);
@@ -2042,6 +2102,18 @@ public abstract class ConnectionService extends Service {
findConnectionForAction(callId, "reject").onReject(rejectReason);
}
private void transfer(String callId, Uri number, boolean isConfirmationRequired) {
Log.d(this, "transfer %s", callId);
findConnectionForAction(callId, "transfer").onTransfer(number, isConfirmationRequired);
}
private void consultativeTransfer(String callId, String otherCallId) {
Log.d(this, "consultativeTransfer %s", callId);
Connection connection1 = findConnectionForAction(callId, "consultativeTransfer");
Connection connection2 = findConnectionForAction(otherCallId, " consultativeTransfer");
connection1.onTransfer(connection2);
}
private void silence(String callId) {
Log.d(this, "silence %s", callId);
findConnectionForAction(callId, "silence").onSilence();

30
telecomm/java/android/telecom/InCallAdapter.java Normal file → Executable file
View File

@@ -16,6 +16,7 @@
package android.telecom;
import android.annotation.NonNull;
import android.bluetooth.BluetoothDevice;
import android.net.Uri;
import android.os.Bundle;
@@ -101,6 +102,35 @@ public final class InCallAdapter {
}
}
/**
* Instructs Telecom to transfer the specified call.
*
* @param callId The identifier of the call to transfer.
* @param targetNumber The address to transfer to.
* @param isConfirmationRequired if {@code true} it will initiate ASSURED transfer,
* if {@code false}, it will initiate BLIND transfer.
*/
public void transferCall(@NonNull String callId, @NonNull Uri targetNumber,
boolean isConfirmationRequired) {
try {
mAdapter.transferCall(callId, targetNumber, isConfirmationRequired);
} catch (RemoteException e) {
}
}
/**
* Instructs Telecom to transfer the specified call to another ongoing call.
*
* @param callId The identifier of the call to transfer.
* @param otherCallId The identifier of the other call to which this will be transferred.
*/
public void transferCall(@NonNull String callId, @NonNull String otherCallId) {
try {
mAdapter.consultativeTransfer(callId, otherCallId);
} catch (RemoteException e) {
}
}
/**
* Instructs Telecom to disconnect the specified call.
*

5
telecomm/java/com/android/internal/telecom/IConnectionService.aidl
View File

@@ -81,6 +81,11 @@ oneway interface IConnectionService {
void rejectWithMessage(String callId, String message, in Session.Info sessionInfo);
void transfer(String callId, in Uri number, boolean isConfirmationRequired,
in Session.Info sessionInfo);
void consultativeTransfer(String callId, String otherCallId, in Session.Info sessionInfo);
void disconnect(String callId, in Session.Info sessionInfo);
void silence(String callId, in Session.Info sessionInfo);

4
telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl Normal file → Executable file
View File

@@ -36,6 +36,10 @@ oneway interface IInCallAdapter {
void rejectCallWithReason(String callId, int rejectReason);
void transferCall(String callId, in Uri targetNumber, boolean isConfirmationRequired);
void consultativeTransfer(String callId, String otherCallId);
void disconnectCall(String callId);
void holdCall(String callId);

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1987,6 +1987,13 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL =
"carrier_allow_deflect_ims_call_bool";
/**
* Flag indicating whether the carrier supports explicit call transfer for an IMS call.
* @hide
*/
public static final String KEY_CARRIER_ALLOW_TRANSFER_IMS_CALL_BOOL =
"carrier_allow_transfer_ims_call_bool";
/**
* Flag indicating whether the carrier always wants to play an "on-hold" tone when a call has
* been remotely held.
@@ -3511,6 +3518,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CARRIER_CONFIG_VERSION_STRING, "");
sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_ALLOW_TRANSFER_IMS_CALL_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL, false);
sDefaults.putBoolean(KEY_AUTO_RETRY_FAILED_WIFI_EMERGENCY_CALL, false);
sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);

66
telephony/java/android/telephony/ims/ImsCallSession.java Normal file → Executable file
View File

@@ -16,6 +16,8 @@
package android.telephony.ims;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Message;
import android.os.RemoteException;
import android.telephony.CallQuality;
@@ -450,6 +452,21 @@ public class ImsCallSession {
// no-op
}
/**
* Received success response for call transfer request.
*/
public void callSessionTransferred(@NonNull ImsCallSession session) {
// no-op
}
/**
* Received failure response for call transfer request.
*/
public void callSessionTransferFailed(@NonNull ImsCallSession session,
@Nullable ImsReasonInfo reasonInfo) {
// no-op
}
/**
* Called when the IMS service reports a change to the call quality.
*/
@@ -794,6 +811,41 @@ public class ImsCallSession {
}
}
/**
* Transfers an ongoing call.
*
* @param number number to be transferred to.
* @param isConfirmationRequired indicates blind or assured transfer.
*/
public void transfer(@NonNull String number, boolean isConfirmationRequired) {
if (mClosed) {
return;
}
try {
miSession.transfer(number, isConfirmationRequired);
} catch (RemoteException e) {
}
}
/**
* Transfers a call to another ongoing call.
*
* @param transferToSession the other ImsCallSession to which this session will be transferred.
*/
public void transfer(@NonNull ImsCallSession transferToSession) {
if (mClosed) {
return;
}
try {
if (transferToSession != null) {
miSession.consultativeTransfer(transferToSession.getSession());
}
} catch (RemoteException e) {
}
}
/**
* Terminates a call.
*
@@ -1410,6 +1462,20 @@ public class ImsCallSession {
}
}
@Override
public void callSessionTransferred() {
if (mListener != null) {
mListener.callSessionTransferred(ImsCallSession.this);
}
}
@Override
public void callSessionTransferFailed(@Nullable ImsReasonInfo reasonInfo) {
if (mListener != null) {
mListener.callSessionTransferFailed(ImsCallSession.this, reasonInfo);
}
}
/**
* Call quality updated
*/

6
telephony/java/android/telephony/ims/aidl/IImsCallSessionListener.aidl
View File

@@ -147,6 +147,12 @@ oneway interface IImsCallSessionListener {
*/
void callSessionRttAudioIndicatorChanged(in ImsStreamMediaProfile profile);
/**
* Notifies the result of transfer request.
*/
void callSessionTransferred();
void callSessionTransferFailed(in ImsReasonInfo reasonInfo);
/**
* Notifies of a change to the call quality.
* @param callQuality then updated call quality

36
telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java Normal file → Executable file
View File

@@ -16,6 +16,8 @@
package android.telephony.ims.compat.stub;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.compat.annotation.UnsupportedAppUsage;
import android.os.Message;
import android.os.RemoteException;
@@ -196,6 +198,29 @@ public class ImsCallSessionImplBase extends IImsCallSession.Stub {
public void deflect(String deflectNumber) {
}
/**
* Transfer an established call to given number, disconnecting the ongoing call
* when the transfer is complete.
*
* @param number number to transfer the call
* @param isConfirmationRequired when {@code true}, then the {@link ImsCallSessionImplBase}
* should wait until the transfer has successfully completed before disconnecting the current
* {@link ImsCallSessionImplBase}. When {@code false}, the {@link ImsCallSessionImplBase}
* should signal the network to perform the transfer, but should immediately disconnect the
* call regardless of the outcome of the transfer.
*/
@Override
public void transfer(@NonNull String number, boolean isConfirmationRequired) {
}
/**
* Transfer an established call to an existing ongoing session.
* When the transfer is complete, the current call gets disconnected locally.
*/
@Override
public void consultativeTransfer(@NonNull IImsCallSession transferToSession) {
}
/**
* Rejects an incoming call or session update.
*
@@ -609,6 +634,17 @@ public class ImsCallSessionImplBase extends IImsCallSession.Stub {
mNewListener.callSessionRttAudioIndicatorChanged(profile);
}
@Override
public void callSessionTransferred() throws RemoteException {
mNewListener.callSessionTransferred();
}
@Override
public void callSessionTransferFailed(@Nullable ImsReasonInfo reasonInfo)
throws RemoteException {
mNewListener.callSessionTransferFailed(reasonInfo);
}
@Override
public void callQualityChanged(CallQuality callQuality) throws RemoteException {
mNewListener.callQualityChanged(callQuality);

33
telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java
View File

@@ -16,6 +16,7 @@
package android.telephony.ims.stub;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Message;
@@ -182,6 +183,18 @@ public class ImsCallSessionImplBase implements AutoCloseable {
ImsCallSessionImplBase.this.reject(reason);
}
@Override
public void transfer(@NonNull String number, boolean isConfirmationRequired) {
ImsCallSessionImplBase.this.transfer(number, isConfirmationRequired);
}
@Override
public void consultativeTransfer(@NonNull IImsCallSession transferToSession) {
ImsCallSessionImplBase otherSession = new ImsCallSessionImplBase();
otherSession.setServiceImpl(transferToSession);
ImsCallSessionImplBase.this.transfer(otherSession);
}
@Override
public void terminate(int reason) {
ImsCallSessionImplBase.this.terminate(reason);
@@ -422,6 +435,26 @@ public class ImsCallSessionImplBase implements AutoCloseable {
public void reject(int reason) {
}
/**
* Transfer an established call to given number
*
* @param number number to transfer the call
* @param isConfirmationRequired if {@code True}, indicates Assured transfer,
* if {@code False} it indicates Blind transfer.
* @hide
*/
public void transfer(@NonNull String number, boolean isConfirmationRequired) {
}
/**
* Transfer an established call to another call session
*
* @param otherSession The other ImsCallSession to transfer the ongoing session to.
* @hide
*/
public void transfer(@NonNull ImsCallSessionImplBase otherSession) {
}
/**
* Terminates a call.
*

17
telephony/java/com/android/ims/internal/IImsCallSession.aidl
View File

@@ -18,7 +18,6 @@ package com.android.ims.internal;
import android.os.Message;
import android.telephony.ims.aidl.IImsCallSessionListener;
import android.telephony.ims.ImsCallProfile;
import android.telephony.ims.ImsStreamMediaProfile;
import com.android.ims.internal.IImsVideoCallProvider;
@@ -150,6 +149,22 @@ interface IImsCallSession {
*/
void reject(int reason);
/**
* Transfer an established call to given number
*
* @param number number to transfer the call
* @param isConfirmationRequired if {@code True}, indicates Assured transfer,
* if {@code False} it indicates Blind transfer.
*/
void transfer(String number, boolean isConfirmationRequired);
/**
* Transfer an established call to another call session
*
* @param transferToSession The other ImsCallSession to transfer the ongoing session to.
*/
void consultativeTransfer(in IImsCallSession transferToSession);
/**
* Terminates a call.
*

6
telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
View File

@@ -183,6 +183,12 @@ oneway interface IImsCallSessionListener {
*/
void callSessionRttAudioIndicatorChanged(in ImsStreamMediaProfile profile);
/**
* Notifies about the response for call transfer request.
*/
void callSessionTransferred();
void callSessionTransferFailed(in ImsReasonInfo reasonInfo);
/**
* Notifies of a change to the call quality.
* @param callQuality then updated call quality