diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-07-28 18:15:48 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2014-08-06 03:36:09 -0700 |
| commit | 7c7bc7f6917484250974c5da00af9ef756844b0a (patch) | |
| tree | 86799cdb91972735a4bf94c92993790176459d71 /telecomm/java/com/android/internal | |
| parent | 022e7cc2985046af45e4b0a2fce78870f6e6dfac (diff) | |
| download | frameworks_base-7c7bc7f6917484250974c5da00af9ef756844b0a.zip frameworks_base-7c7bc7f6917484250974c5da00af9ef756844b0a.tar.gz frameworks_base-7c7bc7f6917484250974c5da00af9ef756844b0a.tar.bz2 | |
Add setConferenceable() API from ConnectionService to incall. (1/4)
Change-Id: I64fdca08d35f893d755e3b154543a261b1418343
Diffstat (limited to 'telecomm/java/com/android/internal')
| -rw-r--r-- | telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl | 2 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl index 60b5e1e..c6f9712 100644 --- a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl +++ b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl @@ -77,5 +77,7 @@ oneway interface IConnectionServiceAdapter { void setCallerDisplayName(String callId, String callerDisplayName, int presentation); + void setConferenceableConnections(String callId, in List<String> conferenceableCallIds); + void startActivityFromInCall(String callId, in PendingIntent intent); } diff --git a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl index fc09a3a..8bc950f 100644 --- a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl +++ b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl @@ -51,7 +51,7 @@ oneway interface IInCallAdapter { void phoneAccountSelected(String callId, in PhoneAccountHandle accountHandle); - void conference(String callId); + void conference(String callId, String otherCallId); void splitFromConference(String callId); |