summaryrefslogtreecommitdiffstats
path: root/telecomm/java/com
diff options
context:
space:
mode:
authorSailesh Nepal <sail@google.com>2014-07-11 14:50:13 -0700
committerSailesh Nepal <sail@google.com>2014-07-12 03:01:13 +0000
commit612038642fa9cf1545dbcc8274d313192ce928b5 (patch)
tree6198bbf7ee9c8188d6eb5fa7e37f962b4a6857b6 /telecomm/java/com
parent94686d13cacbec1ce7cf5fd0178fffb037d03cc1 (diff)
downloadframeworks_base-612038642fa9cf1545dbcc8274d313192ce928b5.zip
frameworks_base-612038642fa9cf1545dbcc8274d313192ce928b5.tar.gz
frameworks_base-612038642fa9cf1545dbcc8274d313192ce928b5.tar.bz2
Misc Telecomm API changes
The CL contains the following Telecomm API changes: - move CallFeatures into CallCapabilities - add Connection.setHandle(URI, CallPropertyPresentation) - add Connection.setCallerDisplayName(String, CallPropertyPresentation) - add Connection.swapWithBackground: this is used to swap a CDMA call with its background call - add StatusHints.getExtras: this is used to display additional status info such as long distance rates This CL also includes InCallServcie, and RemoteConnection plumbing for the above. Change-Id: Iaffe0b84cea6003f2a9b9d8b30676743d2b236d4
Diffstat (limited to 'telecomm/java/com')
-rw-r--r--telecomm/java/com/android/internal/telecomm/IConnectionService.aidl2
-rw-r--r--telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl7
-rw-r--r--telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl2
3 files changed, 9 insertions, 2 deletions
diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl
index c8ce4c6..16d2edf 100644
--- a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl
@@ -58,6 +58,8 @@ oneway interface IConnectionService {
void splitFromConference(String callId);
+ void swapWithBackgroundCall(String callId);
+
void onPostDialContinue(String callId, boolean proceed);
void onPhoneAccountClicked(String callId);
diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
index e724bfb..bc67eab 100644
--- a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
@@ -16,6 +16,7 @@
package com.android.internal.telecomm;
+import android.net.Uri;
import android.telecomm.ConnectionRequest;
import android.telecomm.StatusHints;
@@ -64,9 +65,11 @@ oneway interface IConnectionServiceAdapter {
void setCallVideoProvider(String callId, ICallVideoProvider callVideoProvider);
- void setFeatures(String callId, int features);
-
void setAudioModeIsVoip(String callId, boolean isVoip);
void setStatusHints(String callId, in StatusHints statusHints);
+
+ void setHandle(String callId, in Uri handle, int presentation);
+
+ void setCallerDisplayName(String callId, String callerDisplayName, int presentation);
}
diff --git a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
index 7f3767c..ce0309f 100644
--- a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
@@ -51,4 +51,6 @@ oneway interface IInCallAdapter {
void conference(String callId);
void splitFromConference(String callId);
+
+ void swapWithBackgroundCall(String callId);
}