summaryrefslogtreecommitdiffstats
path: root/telecomm/java/com
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-10-30 14:27:48 -0700
committerTyler Gunn <tgunn@google.com>2014-10-30 14:27:48 -0700
commit4a57b9b59b74c97e559a301af0add13cd4c3331c (patch)
tree30f66ba4ddd516a95c08b8b370e8fe56698932cc /telecomm/java/com
parent272e2f73bd825aa6b1db0a5b332effe8b84d7b8c (diff)
downloadframeworks_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/com')
-rw-r--r--telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl2
1 files changed, 2 insertions, 0 deletions
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<String> conferenceableCallIds);
+
+ void addExistingConnection(String callId, in ParcelableConnection connection);
}