Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d

am: 27d9ca08da

Change-Id: If7609c87ad507f9ec6cd3fd19d779e68c55e6280
This commit is contained in:
Brad Ebinger
2017-08-02 23:10:28 +00:00
committed by android-build-merger

View File

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