commit c50f3f0d4a644ae27369afcb329589c4c8fa24b9
author Zhao Fan <zhaof@codeaurora.org> Fri Dec 30 14:00:01 2016 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jan 22 23:50:05 2017 -0800
tree 4de3c7babea3be68e74652dfb0f70f0780e055f3
parent 60d6caa31fd39b2caea0f4ccd4ad840ee7e81a86

IMS: Hide secondary caller info when end conference call

Hide secondary caller info when there is no call capabilities
even when the secondary call is active.

Change-Id: I37338e0596fdcc5ed7f0ba15d6f6d9b74c19b83f
CRs-Fixed: 1105251

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 91b67f8..ff90272 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -943,6 +943,10 @@
             return;
         }
 
+        final boolean notUpdateSecondary = mSecondary.getState() == Call.State.ACTIVE
+                && !mSecondary.can(android.telecom.Call.Details.CAPABILITY_SUPPORT_HOLD)
+                && !mSecondary.can(android.telecom.Call.Details.CAPABILITY_HOLD);
+        Log.d(TAG, "notUpdateSecondary:" + notUpdateSecondary);
         if (mSecondary.isConferenceCall()) {
             ui.setSecondary(
                     true /* show */,
@@ -953,7 +957,7 @@
                     true /* isConference */,
                     mSecondary.isVideoCall(mContext),
                     mIsFullscreen);
-        } else if (mSecondaryContactInfo != null) {
+        } else if (mSecondaryContactInfo != null && !notUpdateSecondary) {
             Log.d(TAG, "updateSecondaryDisplayInfo() " + mSecondaryContactInfo);
             String name = getNameForCall(mSecondaryContactInfo);
             boolean nameIsNumber = name != null && name.equals(mSecondaryContactInfo.number);