Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am:... (e57175c0) · Commits · e / os / android_frameworks_base

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