diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-09-04 17:39:22 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2014-09-05 16:13:19 -0700 |
| commit | a48680427e022ab6eb73277faac6c57831ee6ff9 (patch) | |
| tree | d3638b6973f85472173fdb8255084962ff09d9c8 /telecomm/java/com | |
| parent | a0c9962388361522257b4ff2f55ac7cea0d559f3 (diff) | |
| download | frameworks_base-a48680427e022ab6eb73277faac6c57831ee6ff9.zip frameworks_base-a48680427e022ab6eb73277faac6c57831ee6ff9.tar.gz frameworks_base-a48680427e022ab6eb73277faac6c57831ee6ff9.tar.bz2 | |
Updating APIs for CDMA conference call support.
Bug:17316859
Change-Id: Ib80c4dcf99c8599c011496756c363c3e6147c20a
Diffstat (limited to 'telecomm/java/com')
| -rw-r--r-- | telecomm/java/com/android/internal/telecomm/IConnectionService.aidl | 4 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl | 4 |
2 files changed, 8 insertions, 0 deletions
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); |