commit 4d920a849c9efa7b31a417e44a6fa2f84c94f346
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 11 04:36:22 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jan 11 04:36:22 2017 -0800
tree f1c110728d473c49904746a99a878ac843a61339
parent b8eae3ff76b19b1447e18eca737c7903417fcda4
parent 4a34f658c67e7be521d3f1fb11e32f8adc173a81

Merge "IMS-VT: Fix size and mirror image issue for preview video." into atel.lnx.2.0-dev

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 99c8bde..596d9da 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -953,6 +953,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 */,
@@ -963,7 +967,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);