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

Merge "Remove Conferenceable update squelching" into oc-dr1-dev

Browse Source 
am: 4b6ef9c92d

Change-Id: I93a849f16c7c4d3bc4495f1baff905d16f0e78ff
This commit is contained in:
Brad Ebinger
2017-08-02 21:40:34 +00:00
committed by android-build-merger
parent 7def2eea97 4b6ef9c92d
commit 27d9ca08da
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telecomm/java/android/telecom/Conference.java
View File

@@ -454,10 +454,6 @@ public abstract class Conference extends Conferenceable {
* @param conferenceableConnections The set of connections this connection can conference with. * @param conferenceableConnections The set of connections this connection can conference with.
*/ */
public final void setConferenceableConnections(List<Connection> conferenceableConnections) { public final void setConferenceableConnections(List<Connection> conferenceableConnections) {
if (Objects.equals(mConferenceableConnections, conferenceableConnections)) {
return;
}
clearConferenceableList(); clearConferenceableList();
for (Connection c : conferenceableConnections) { for (Connection c : conferenceableConnections) {
// If statement checks for duplicates in input. It makes it N^2 but we're dealing with a // If statement checks for duplicates in input. It makes it N^2 but we're dealing with a