| commit | 6d76ca0438c2cb7a7d5d91992db819c063c0a57b | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Nov 17 15:49:51 2014 -0800 |
| committer | Tyler Gunn <tgunn@google.com> | Mon Nov 17 15:49:51 2014 -0800 |
| tree | 74a11f2f8b5c7d736a3ff816c31d9a998f21cada | |
| parent | 5aadd5b6fa8ee9f09cd4870c8f104c1e611aebcd [diff] |
Change Connections to allow setting conferenceable with conferences. - Added IConferenceable interface used so that connections and conferences can both be considered candidates as "conferenceable" with a connection. - Fixed ConnectionService#conference to support cases where either call 1 or call 2 is a conference and the other is a connection. Previously did not support cases where call 2 is a conference. Bug: 18200934 Change-Id: I32a8dd30a154d6280f2ae89fd147817235998465