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

Commit 27d9ca08 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: I93a849f16c7c4d3bc4495f1baff905d16f0e78ff
parents 7def2eea 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