diff options
author | Tyler Gunn <tgunn@google.com> | 2014-10-30 14:27:48 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2014-10-30 14:27:48 -0700 |
commit | 4a57b9b59b74c97e559a301af0add13cd4c3331c (patch) | |
tree | 30f66ba4ddd516a95c08b8b370e8fe56698932cc /telecomm/java/android/telecom/RemoteConnectionService.java | |
parent | 272e2f73bd825aa6b1db0a5b332effe8b84d7b8c (diff) | |
download | frameworks_base-4a57b9b59b74c97e559a301af0add13cd4c3331c.zip frameworks_base-4a57b9b59b74c97e559a301af0add13cd4c3331c.tar.gz frameworks_base-4a57b9b59b74c97e559a301af0add13cd4c3331c.tar.bz2 |
Creating connections for conference event package participants.
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.
Bug: 18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
Diffstat (limited to 'telecomm/java/android/telecom/RemoteConnectionService.java')
-rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionService.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index af4ee22..4bb78c0 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -41,8 +41,9 @@ import java.util.UUID; */ final class RemoteConnectionService { + // Note: Casting null to avoid ambiguous constructor reference. private static final RemoteConnection NULL_CONNECTION = - new RemoteConnection("NULL", null, null); + new RemoteConnection("NULL", null, (ConnectionRequest) null); private static final RemoteConference NULL_CONFERENCE = new RemoteConference("NULL", null); @@ -286,6 +287,15 @@ final class RemoteConnectionService { .setConferenceableConnections(conferenceable); } } + + @Override + public void addExistingConnection(String callId, ParcelableConnection connection) { + // TODO: add contents of this method + RemoteConnection remoteConnction = new RemoteConnection(callId, + mOutgoingConnectionServiceRpc, connection); + + mOurConnectionServiceImpl.addRemoteExistingConnection(remoteConnction); + } }; private final ConnectionServiceAdapterServant mServant = |