Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab87b6dc authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

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

am: 4b6ef9c9

Change-Id: I30fbedd2fa26482d520fef48f0dd81aa923b06b7
parents 9c4115a5 4b6ef9c9

telecomm/java/android/telecom/Conference.java

+0 −4
Original line number Diff line number Diff line
@@ -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