diff options
Diffstat (limited to 'telecomm/java')
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java | 8 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 7 |
2 files changed, 8 insertions, 7 deletions
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); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 34d0660..4135ec3 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -921,7 +921,6 @@ public abstract class Connection { mConference = conference; if (mConnectionService != null && mConnectionService.containsConference(conference)) { fireConferenceChanged(); - onConferenceChanged(); } return true; } @@ -937,7 +936,6 @@ public abstract class Connection { Log.d(this, "Conference reset"); mConference = null; fireConferenceChanged(); - onConferenceChanged(); } } @@ -1030,11 +1028,6 @@ public abstract class Connection { */ public void onPostDialContinue(boolean proceed) {} - /** - * Notifies this Connection that the conference which is set on it has changed. - */ - public void onConferenceChanged() {} - static String toLogSafePhoneNumber(String number) { // For unknown number, log empty string. if (number == null) { |