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
This commit is contained in:
Tyler Gunn
2014-11-17 15:49:51 -08:00
parent 5aadd5b6fa
commit 6d76ca0438
4 changed files with 146 additions and 25 deletions

View File

@@ -30,7 +30,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
* @hide
*/
@SystemApi
public abstract class Conference {
public abstract class Conference implements IConferenceable {
/** @hide */
public abstract static class Listener {