diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-06-04 20:20:58 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2014-06-12 16:15:09 -0700 |
| commit | b693998fdfdd4498a33c4c69405f2708e4840aa7 (patch) | |
| tree | 3bf5a89f8cd3605ecfa8e9d548fd631ac8c62120 /telecomm/java/com | |
| parent | 7f2cd8df473c82cc10d1914cd563ba1b63e22a54 (diff) | |
| download | frameworks_base-b693998fdfdd4498a33c4c69405f2708e4840aa7.zip frameworks_base-b693998fdfdd4498a33c4c69405f2708e4840aa7.tar.gz frameworks_base-b693998fdfdd4498a33c4c69405f2708e4840aa7.tar.bz2 | |
Support conference calling. (1/4)
Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
Diffstat (limited to 'telecomm/java/com')
3 files changed, 7 insertions, 5 deletions
diff --git a/telecomm/java/com/android/internal/telecomm/ICallService.aidl b/telecomm/java/com/android/internal/telecomm/ICallService.aidl index 9139aa6..827f331 100644 --- a/telecomm/java/com/android/internal/telecomm/ICallService.aidl +++ b/telecomm/java/com/android/internal/telecomm/ICallService.aidl @@ -56,9 +56,9 @@ oneway interface ICallService { void stopDtmfTone(String callId); - void addToConference(String conferenceCallId, in List<String> callIds); + void conference(String conferenceCallId, String callId); - void splitFromConference(String conferenceCallId, String callId); + void splitFromConference(String callId); void onPostDialContinue(String callId, boolean proceed); } diff --git a/telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl b/telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl index b380293..6e176eb 100644 --- a/telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl +++ b/telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl @@ -47,9 +47,11 @@ oneway interface ICallServiceAdapter { void setRequestingRingback(String callId, boolean ringing); - void setCanConferenceWith(String callId, in List<String> conferenceCapableCallIds); + void setCanConference(String callId, boolean canConference); - void setIsConferenced(String conferenceCallId, String callId, boolean isConferenced); + void setIsConferenced(String callId, String conferenceCallId); + + void addConferenceCall(String callId, in CallInfo callInfo); void removeCall(String callId); diff --git a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl index f144043..5717456 100644 --- a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl +++ b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl @@ -48,7 +48,7 @@ oneway interface IInCallAdapter { void handoffCall(String callId); - void conferenceWith(String callId, String callIdToConference); + void conference(String callId); void splitFromConference(String callId); } |