commit 205cb7871a46cdb0d6367dccffde3b1c3e208361
author Ravindra <c_rthat@codeaurora.org> Wed Oct 07 16:57:53 2015 +0530
committer Ravindra <c_rthat@codeaurora.org> Thu Oct 08 12:33:30 2015 +0530
tree 7526b4018d9f4b7aa30c3c05d7ad59626e080e73
parent c6183efa30af7f56bbf3c66fbf66fc46578bc9d6

Fix to display merge icon on failure.

Trigger a state change to incallui with the existing state
on an unsuccessful merge in order to enable merge icon.

Change-Id: I6bb3a151f27e38cf788cb148ce61005b62cb8e2b
CRs-Fixed: 815642

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

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 8c6e4cf..8d164ec 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -82,6 +82,7 @@
         void onVideoStateChanged(Call call);
         void onCanAddCallChanged(boolean canAddCall);
         void onSessionModifyRequestReceived(Call call, VideoProfile videoProfile);
+        void onMergeFailed(Call call);
     }
 
     private static final String TAG = "CallsManager";
@@ -2296,4 +2297,12 @@
             updateForegroundCall();
         }
     }
+
+    void onMergeFailed(Call call) {
+        if (mCalls.contains(call)) {
+            for (CallsManagerListener listener : mListeners) {
+                listener.onMergeFailed(call);
+            }
+        }
+    }
 }