commit 495a817210ee0a95f3fe6c67f6a963ea7d2d80d3
author Tyler Gunn <tgunn@google.com> Fri Oct 03 00:56:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 03 00:56:11 2014 +0000
tree 85c31c59ec4d3c8f59a29cce8f0b6681513dfefc
parent 4dc2bed1f5160726db2b8797c0e89fa4c8a4884a
parent c3f986b5ac49756ba44de15e8fdeb761c124e913

am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit 'c3f986b5ac49756ba44de15e8fdeb761c124e913':
  Conference call merge button visibility issue. (1/2)

src/com/android/server/telecom/Call.java

diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 49bda94..ca72ec8 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -936,6 +936,10 @@
     void setConferenceableCalls(List<Call> conferenceableCalls) {
         mConferenceableCalls.clear();
         mConferenceableCalls.addAll(conferenceableCalls);
+
+        for (Listener l : mListeners) {
+            l.onConferenceableCallsChanged(this);
+        }
     }
 
     List<Call> getConferenceableCalls() {