summaryrefslogtreecommitdiffstats
path: root/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
diff options
context:
space:
mode:
Diffstat (limited to 'telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl')
-rw-r--r--telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl4
1 files changed, 4 insertions, 0 deletions
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);