diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-11-17 15:49:51 -0800 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2014-11-17 15:49:51 -0800 |
| commit | 6d76ca0438c2cb7a7d5d91992db819c063c0a57b (patch) | |
| tree | 74a11f2f8b5c7d736a3ff816c31d9a998f21cada /telecomm/java/android/telecom/Conference.java | |
| parent | 5aadd5b6fa8ee9f09cd4870c8f104c1e611aebcd (diff) | |
| download | frameworks_base-6d76ca0438c2cb7a7d5d91992db819c063c0a57b.zip frameworks_base-6d76ca0438c2cb7a7d5d91992db819c063c0a57b.tar.gz frameworks_base-6d76ca0438c2cb7a7d5d91992db819c063c0a57b.tar.bz2 | |
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
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 215c682..6e404de 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -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 { |