summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-08-02 21:26:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-02 21:26:19 +0000
commit4b6ef9c92d1319dbb409def4b0fb68c1e719068a (patch)
tree4d22341f83db4fcc980c0157dea355c11f11b383
parent986995d481a6ecff1285a05a060b537b64cfe61d (diff)
parent8c6f0cab335df7463b2a734ce63065e7c9d72a16 (diff)
Merge "Remove Conferenceable update squelching" into oc-dr1-dev
-rw-r--r--telecomm/java/android/telecom/Conference.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 177759e6751f..db4939171aa6 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<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