From 4a57b9b59b74c97e559a301af0add13cd4c3331c Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Thu, 30 Oct 2014 14:27:48 -0700 Subject: 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 --- .../java/com/android/internal/telecom/IConnectionServiceAdapter.aidl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'telecomm/java/com') diff --git a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl index 5daa568..0d6b3d9 100644 --- a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl +++ b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl @@ -77,4 +77,6 @@ oneway interface IConnectionServiceAdapter { void setCallerDisplayName(String callId, String callerDisplayName, int presentation); void setConferenceableConnections(String callId, in List conferenceableCallIds); + + void addExistingConnection(String callId, in ParcelableConnection connection); } -- cgit v1.1