From a48680427e022ab6eb73277faac6c57831ee6ff9 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Thu, 4 Sep 2014 17:39:22 -0700 Subject: Updating APIs for CDMA conference call support. Bug:17316859 Change-Id: Ib80c4dcf99c8599c011496756c363c3e6147c20a --- telecomm/java/com/android/internal/telecomm/IConnectionService.aidl | 4 ++++ telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'telecomm/java/com') diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl index 32b877d..a673733 100644 --- a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl +++ b/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl @@ -65,6 +65,10 @@ oneway interface IConnectionService { void splitFromConference(String callId); + void mergeConference(String conferenceCallId); + + void swapConference(String conferenceCallId); + void onPostDialContinue(String callId, boolean proceed); void onPhoneAccountClicked(String callId); diff --git a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl index 2ce5c6b..626bb91 100644 --- a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl +++ b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl @@ -54,6 +54,10 @@ oneway interface IInCallAdapter { void splitFromConference(String callId); + void mergeConference(String callId); + + void swapConference(String callId); + void turnOnProximitySensor(); void turnOffProximitySensor(boolean screenOnImmediately); -- cgit v1.1