From 8c6f0cab335df7463b2a734ce63065e7c9d72a16 Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Tue, 1 Aug 2017 15:23:26 -0700 Subject: [PATCH] Remove Conferenceable update squelching In an effort to remove redundant updates to Telecom, conferenceable connection updates for a conference were being removed if the list of connections hasn't changed. For GSM, when a new outgoing call was placed, it was added to the conference controller before being added to the list of connections. The conference controller was updating the conferenceable connections for that conference with a connection that wasn't being tracked yet, so it was not notifying telecom of the connection. It was still added to the list of conferenceable connections in the conference, however, so later conferenceable updates were being disregarded before being sent to Telecom. This change removes conferenceable update squelching so that we always update telecom with the correct conferencable connections for a conference. Bug: 37989809 Test: Manual, Procedure in Bug, unit tests Change-Id: I62960df9db27f0b303431aef99e73ef87498d374 --- telecomm/java/android/telecom/Conference.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 177759e6751f7..db4939171aa6a 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -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 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