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

This commit is contained in:
TreeHugger Robot
2017-08-02 21:26:19 +00:00
committed by Android (Google) Code Review

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