diff options
author | Tyler Gunn <tgunn@google.com> | 2014-10-30 14:27:48 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2014-10-30 14:27:48 -0700 |
commit | 4a57b9b59b74c97e559a301af0add13cd4c3331c (patch) | |
tree | 30f66ba4ddd516a95c08b8b370e8fe56698932cc /telecomm/java/android/telecom/Conference.java | |
parent | 272e2f73bd825aa6b1db0a5b332effe8b84d7b8c (diff) |
Creating connections for conference event package participants.
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.
Bug: 18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
-rw-r--r-- | telecomm/java/android/telecom/Conference.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 15cb786fba1c..003d5cd4876c 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -334,6 +334,19 @@ public abstract class Conference { } /** + * Retrieves the primary connection associated with the conference. The primary connection is + * the connection from which the conference will retrieve its current state. + * + * @return The primary connection. + */ + public Connection getPrimaryConnection() { + if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) { + return null; + } + return mUnmodifiableChildConnections.get(0); + } + + /** * Inform this Conference that the state of its audio output has been changed externally. * * @param state The new audio state. |