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

Add further Connection-side APIs for RTT (part 2)

Browse Source 
Add methods and callbacks to facilitate local and remote RTT initiation
and termination in the middle of a call. Adds @hide Connection-side APIs
to communicate with the ConnectionService, as well as plumbing for
RemoteConnections.

Test: manual, through telecom testapps
Merged-In: Ia80604b7dff8586ff222dbccdbe55e91aab02178
Change-Id: Ia80604b7dff8586ff222dbccdbe55e91aab02178
This commit is contained in:
Hall Liu
2017-02-06 10:49:48 -08:00
parent 7f0300f1e2
commit b64ac4c57a
17 changed files with 670 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -26,6 +26,8 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.telecom.Logging.Session;
import com.android.internal.os.SomeArgs;
@@ -119,6 +121,9 @@ public abstract class ConnectionService extends Service {
private static final String SESSION_PULL_EXTERNAL_CALL = "CS.pEC";
private static final String SESSION_SEND_CALL_EVENT = "CS.sCE";
private static final String SESSION_EXTRAS_CHANGED = "CS.oEC";
private static final String SESSION_START_RTT = "CS.+RTT";
private static final String SESSION_STOP_RTT = "CS.-RTT";
private static final String SESSION_RTT_UPGRADE_RESPONSE = "CS.rTRUR";
private static final int MSG_ADD_CONNECTION_SERVICE_ADAPTER = 1;
private static final int MSG_CREATE_CONNECTION = 2;
@@ -144,6 +149,9 @@ public abstract class ConnectionService extends Service {
private static final int MSG_SEND_CALL_EVENT = 23;
private static final int MSG_ON_EXTRAS_CHANGED = 24;
private static final int MSG_CREATE_CONNECTION_FAILED = 25;
private static final int MSG_ON_START_RTT = 26;
private static final int MSG_ON_STOP_RTT = 27;
private static final int MSG_RTT_UPGRADE_RESPONSE = 28;
private static Connection sNullConnection;
@@ -501,6 +509,53 @@ public abstract class ConnectionService extends Service {
Log.endSession();
}
}
@Override
public void startRtt(String callId, ParcelFileDescriptor fromInCall,
ParcelFileDescriptor toInCall, Session.Info sessionInfo) throws RemoteException {
Log.startSession(sessionInfo, SESSION_START_RTT);
try {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
args.arg2 = new Connection.RttTextStream(toInCall, fromInCall);
args.arg3 = Log.createSubsession();
mHandler.obtainMessage(MSG_ON_START_RTT, args).sendToTarget();
} finally {
Log.endSession();
}
}
@Override
public void stopRtt(String callId, Session.Info sessionInfo) throws RemoteException {
Log.startSession(sessionInfo, SESSION_STOP_RTT);
try {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
args.arg2 = Log.createSubsession();
mHandler.obtainMessage(MSG_ON_STOP_RTT, args).sendToTarget();
} finally {
Log.endSession();
}
}
@Override
public void respondToRttUpgradeRequest(String callId, ParcelFileDescriptor fromInCall,
ParcelFileDescriptor toInCall, Session.Info sessionInfo) throws RemoteException {
Log.startSession(sessionInfo, SESSION_RTT_UPGRADE_RESPONSE);
try {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
if (toInCall == null || fromInCall == null) {
args.arg2 = null;
} else {
args.arg2 = new Connection.RttTextStream(toInCall, fromInCall);
}
args.arg3 = Log.createSubsession();
mHandler.obtainMessage(MSG_RTT_UPGRADE_RESPONSE, args).sendToTarget();
} finally {
Log.endSession();
}
}
};
private final Handler mHandler = new Handler(Looper.getMainLooper()) {
@@ -848,6 +903,49 @@ public abstract class ConnectionService extends Service {
}
break;
}
case MSG_ON_START_RTT: {
SomeArgs args = (SomeArgs) msg.obj;
try {
Log.continueSession((Session) args.arg3,
SESSION_HANDLER + SESSION_START_RTT);
String callId = (String) args.arg1;
Connection.RttTextStream rttTextStream =
(Connection.RttTextStream) args.arg2;
startRtt(callId, rttTextStream);
} finally {
args.recycle();
Log.endSession();
}
break;
}
case MSG_ON_STOP_RTT: {
SomeArgs args = (SomeArgs) msg.obj;
try {
Log.continueSession((Session) args.arg2,
SESSION_HANDLER + SESSION_STOP_RTT);
String callId = (String) args.arg1;
stopRtt(callId);
} finally {
args.recycle();
Log.endSession();
}
break;
}
case MSG_RTT_UPGRADE_RESPONSE: {
SomeArgs args = (SomeArgs) msg.obj;
try {
Log.continueSession((Session) args.arg3,
SESSION_HANDLER + SESSION_RTT_UPGRADE_RESPONSE);
String callId = (String) args.arg1;
Connection.RttTextStream rttTextStream =
(Connection.RttTextStream) args.arg2;
handleRttUpgradeResponse(callId, rttTextStream);
} finally {
args.recycle();
Log.endSession();
}
break;
}
default:
break;
}
@@ -1136,6 +1234,38 @@ public abstract class ConnectionService extends Service {
mAdapter.setAudioRoute(id, audioRoute);
}
}
@Override
public void onRttInitiationSuccess(Connection c) {
String id = mIdByConnection.get(c);
if (id != null) {
mAdapter.onRttInitiationSuccess(id);
}
}
@Override
public void onRttInitiationFailure(Connection c, int reason) {
String id = mIdByConnection.get(c);
if (id != null) {
mAdapter.onRttInitiationFailure(id, reason);
}
}
@Override
public void onRttSessionRemotelyTerminated(Connection c) {
String id = mIdByConnection.get(c);
if (id != null) {
mAdapter.onRttSessionRemotelyTerminated(id);
}
}
@Override
public void onRemoteRttRequest(Connection c) {
String id = mIdByConnection.get(c);
if (id != null) {
mAdapter.onRemoteRttRequest(id);
}
}
};
/** {@inheritDoc} */
@@ -1430,7 +1560,6 @@ public abstract class ConnectionService extends Service {
if (connection != null) {
connection.onCallEvent(event, extras);
}
}
/**
@@ -1454,6 +1583,34 @@ public abstract class ConnectionService extends Service {
}
}
private void startRtt(String callId, Connection.RttTextStream rttTextStream) {
Log.d(this, "startRtt(%s)", callId);
if (mConnectionById.containsKey(callId)) {
findConnectionForAction(callId, "startRtt").onStartRtt(rttTextStream);
} else if (mConferenceById.containsKey(callId)) {
Log.w(this, "startRtt called on a conference.");
}
}
private void stopRtt(String callId) {
Log.d(this, "stopRtt(%s)", callId);
if (mConnectionById.containsKey(callId)) {
findConnectionForAction(callId, "stopRtt").onStopRtt();
} else if (mConferenceById.containsKey(callId)) {
Log.w(this, "stopRtt called on a conference.");
}
}
private void handleRttUpgradeResponse(String callId, Connection.RttTextStream rttTextStream) {
Log.d(this, "handleRttUpgradeResponse(%s, %s)", callId, rttTextStream == null);
if (mConnectionById.containsKey(callId)) {
findConnectionForAction(callId, "handleRttUpgradeResponse")
.handleRttUpgradeResponse(rttTextStream);
} else if (mConferenceById.containsKey(callId)) {
Log.w(this, "handleRttUpgradeResponse called on a conference.");
}
}
private void onPostDialContinue(String callId, boolean proceed) {
Log.d(this, "onPostDialContinue(%s)", callId);
findConnectionForAction(callId, "stopDtmfTone").onPostDialContinue(proceed);