From 46f7f5dce42d645353a0f3eb0dbdd25b3a6c72fb Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 6 Nov 2014 17:00:25 -0800 Subject: Replace onConferenceChanged with onConnectionAdded. This change is motivated by a desire to be able to adjust the phone capabilities of a conference depending on its connections. Turns out Connection is not a good place to do this, because when the conference is set, this code is only fired if the connection service already contains the conference. Conference makes more sense to do this anyways, at the end of the day. + Add onConnectionAdded function to Conference.java. - Remove onConferenceChanged function from Connection.java. Bug: 18241753 Change-Id: Ib9212a8483a7a7b542618697399bbab8b2701b04 --- telecomm/java/android/telecom/Conference.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'telecomm/java/android/telecom/Conference.java') diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 6480a8a..32bdbe0 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -179,6 +179,13 @@ public abstract class Conference { public void onAudioStateChanged(AudioState state) {} /** + * Notifies this conference that a connection has been added to it. + * + * @param connection The newly added connection. + */ + public void onConnectionAdded(Connection connection) {} + + /** * Sets state to be on hold. */ public final void setOnHold() { @@ -238,6 +245,7 @@ public abstract class Conference { if (connection != null && !mChildConnections.contains(connection)) { if (connection.setConference(this)) { mChildConnections.add(connection); + onConnectionAdded(connection); for (Listener l : mListeners) { l.onConnectionAdded(this, connection); } -- cgit v1.1