diff options
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); |