diff options
| author | Brad Ebinger <breadley@google.com> | 2016-10-24 16:40:49 -0700 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2016-10-28 12:14:24 -0700 |
| commit | b32d4f8b5cd5b9c2415e291896b83267e1b4d5fe (patch) | |
| tree | 1d9ee1e991b3d12b0d9fadd6cb6307cbc63fad86 /telecomm/java/android/telecom/RemoteConnectionManager.java | |
| parent | 258790a2ea6faa03f8351bea9f5d602665bfebd9 (diff) | |
Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.
Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
Diffstat (limited to 'telecomm/java/android/telecom/RemoteConnectionManager.java')
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionManager.java b/telecomm/java/android/telecom/RemoteConnectionManager.java index 036650927f3a..0322218d75dc 100644 --- a/telecomm/java/android/telecom/RemoteConnectionManager.java +++ b/telecomm/java/android/telecom/RemoteConnectionManager.java @@ -76,7 +76,7 @@ public class RemoteConnectionManager { public void conferenceRemoteConnections(RemoteConnection a, RemoteConnection b) { if (a.getConnectionService() == b.getConnectionService()) { try { - a.getConnectionService().conference(a.getId(), b.getId()); + a.getConnectionService().conference(a.getId(), b.getId(), null /*Session.Info*/); } catch (RemoteException e) { } } else { |