diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-05-01 10:12:11 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-05-01 10:12:11 -0700 |
| commit | b6f9da0b7f26b50163461a767cafcd8014328742 (patch) | |
| tree | 0b03f879e1dd004edbfa15510500a110e91eb194 /telecomm/java/com | |
| parent | 9dc9c87aadc94c5d35675cc5bfe9e72c5daab885 (diff) | |
| parent | 17455a3d39350a39eb995897929977d793358365 (diff) | |
| download | frameworks_base-b6f9da0b7f26b50163461a767cafcd8014328742.zip frameworks_base-b6f9da0b7f26b50163461a767cafcd8014328742.tar.gz frameworks_base-b6f9da0b7f26b50163461a767cafcd8014328742.tar.bz2 | |
Merge commit '17455a3' into master_merge
Diffstat (limited to 'telecomm/java/com')
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl index 7e7e9cc..67e2edb 100644 --- a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl +++ b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl @@ -56,6 +56,8 @@ oneway interface IConnectionServiceAdapter { void setIsConferenced(String callId, String conferenceCallId); + void setConferenceMergeFailed(String callId); + void addConferenceCall(String callId, in ParcelableConference conference); void removeCall(String callId); |