commit d771d0a58826b6b811e8074f3ae0559687c3a010
author Zhao Fan <zhaof@codeaurora.org> Mon Feb 20 15:14:35 2017 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Feb 19 23:25:45 2017 -0800
tree b6ba13b77f23d0925ae1a870c69d21b5da444e98
parent 5bee7ce608fe5cc0f1c01f2ac824db5750c1f8bf

IMS: Fix held call is not showing for some operators

Use config to control the showing or hiding of held
call when end conference call for specific operators.

Change-Id: I3a833fb1dc0f40d5544b627efd91f3a6d3c12131
CRs-Fixed: 2004551

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 63d98f4..496c349 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -60,6 +60,8 @@
 
 import java.lang.ref.WeakReference;
 
+import org.codeaurora.ims.utils.QtiImsExtUtils;
+
 import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_ENTERPRISE_CALL;
 /**
  * Presenter for the Call Card Fragment.
@@ -956,9 +958,13 @@
             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);
+        boolean notUpdateSecondary = false;
+        if (QtiImsExtUtils.isCarrierConfigEnabled(mContext,
+                "hide_held_call_when_end_conf_call")) {
+            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(