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

Commit b22e5a3b authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c9 am: 27d9ca08" into oc-mr1-dev-plus-aosp
parents 86ff14f4 49b455d1

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