diff options
| author | Brad Ebinger <breadley@google.com> | 2016-10-24 16:40:49 -0700 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2016-10-28 12:14:24 -0700 |
| commit | b32d4f8b5cd5b9c2415e291896b83267e1b4d5fe (patch) | |
| tree | 1d9ee1e991b3d12b0d9fadd6cb6307cbc63fad86 /telecomm/java/android/telecom/RemoteConnectionService.java | |
| parent | 258790a2ea6faa03f8351bea9f5d602665bfebd9 (diff) | |
Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.
Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
Diffstat (limited to 'telecomm/java/android/telecom/RemoteConnectionService.java')
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index c4739ff13a19..26c2e22a2073 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -416,7 +416,8 @@ final class RemoteConnectionService { request.getVideoState()); try { if (mConnectionById.isEmpty()) { - mOutgoingConnectionServiceRpc.addConnectionServiceAdapter(mServant.getStub()); + mOutgoingConnectionServiceRpc.addConnectionServiceAdapter(mServant.getStub(), + null /*Session.Info*/); } RemoteConnection connection = new RemoteConnection(id, mOutgoingConnectionServiceRpc, newRequest); @@ -427,7 +428,8 @@ final class RemoteConnectionService { id, newRequest, isIncoming, - false /* isUnknownCall */); + false /* isUnknownCall */, + null /*Session.info*/); connection.registerCallback(new RemoteConnection.Callback() { @Override public void onDestroyed(RemoteConnection connection) { @@ -467,7 +469,8 @@ final class RemoteConnectionService { private void maybeDisconnectAdapter() { if (mConnectionById.isEmpty() && mConferenceById.isEmpty()) { try { - mOutgoingConnectionServiceRpc.removeConnectionServiceAdapter(mServant.getStub()); + mOutgoingConnectionServiceRpc.removeConnectionServiceAdapter(mServant.getStub(), + null /*Session.info*/); } catch (RemoteException e) { } } |