summaryrefslogtreecommitdiff
path: root/telecomm/java/com
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-19 20:11:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-19 20:11:49 +0000
commitf65d00890f5cc01c12bc2005509bf306fda85c90 (patch)
tree9353f9115ab148034176867962dc3f6776ea4eca /telecomm/java/com
parent9ca6a4957e03b4bcaca34630b68ed3ca787cb87b (diff)
parent4c0cd62311db701942b973f7668f66e2f5a576d6 (diff)
Merge "IMS: Add support for IMS Explicit call transfer" am: 12f7f43ec8 am: 4c0cd62311
Change-Id: Ida84f4a23f19946d0f305304e700b292636762dd
Diffstat (limited to 'telecomm/java/com')
-rw-r--r--telecomm/java/com/android/internal/telecom/IConnectionService.aidl5
-rwxr-xr-x[-rw-r--r--]telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl4
2 files changed, 9 insertions, 0 deletions
diff --git a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
index a397d77db2f6..fb5417994b57 100644
--- a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
+++ b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
@@ -81,6 +81,11 @@ oneway interface IConnectionService {
void rejectWithMessage(String callId, String message, in Session.Info sessionInfo);
+ void transfer(String callId, in Uri number, boolean isConfirmationRequired,
+ in Session.Info sessionInfo);
+
+ void consultativeTransfer(String callId, String otherCallId, in Session.Info sessionInfo);
+
void disconnect(String callId, in Session.Info sessionInfo);
void silence(String callId, in Session.Info sessionInfo);
diff --git a/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl
index 9beff22ce52e..edf1cf4cdb18 100644..100755
--- a/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl
@@ -36,6 +36,10 @@ oneway interface IInCallAdapter {
void rejectCallWithReason(String callId, int rejectReason);
+ void transferCall(String callId, in Uri targetNumber, boolean isConfirmationRequired);
+
+ void consultativeTransfer(String callId, String otherCallId);
+
void disconnectCall(String callId);
void holdCall(String callId);