Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Conference event package performance improvement." into lmp-mr1-dev

Browse Source 
automerge: af7dfdd

* commit 'af7dfddaade234bdad889eee4fcba7ba181031cb':
  Conference event package performance improvement.
This commit is contained in:
Tyler Gunn
2014-11-07 20:57:36 +00:00
committed by android-build-merger
parent d8367c24f7 af7dfddaad
commit 3f5a43b2d3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telecomm/java/android/telecom/Connection.java
View File

@@ -83,8 +83,8 @@ public abstract class Connection {
Connection c, List<Connection> conferenceableConnections) {}
public void onConferenceChanged(Connection c, Conference conference) {}
/** @hide */
public void onConferenceParticipantChanged(Connection c, ConferenceParticipant participant)
{}
public void onConferenceParticipantsChanged(Connection c,
List<ConferenceParticipant> participants) {}
}
/** @hide */
@@ -1124,14 +1124,15 @@ public abstract class Connection {
}
/**
* Notifies listeners of a change to a conference participant.
* Notifies listeners of a change to conference participant(s).
*
* @param conferenceParticipant The participant.
* @param conferenceParticipants The participants.
* @hide
*/
protected final void updateConferenceParticipant(ConferenceParticipant conferenceParticipant) {
protected final void updateConferenceParticipants(
List<ConferenceParticipant> conferenceParticipants) {
for (Listener l : mListeners) {
l.onConferenceParticipantChanged(this, conferenceParticipant);
l.onConferenceParticipantsChanged(this, conferenceParticipants);
}
}
}