commit bdf922411fadb639515dd2553c31746bed425f33
author Pooja Jain <poojain@codeaurora.org> Fri Dec 02 21:34:27 2016 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 15 11:05:13 2016 -0800
tree 74df0565f0af3e3901ace43b27fa9f79b997495c
parent 003e5244f4b6f41de16221a649e2b767323015a2

IMS-VT: Modify conditional logic of showing upgrade video icon

Check for active/held call before checking for
capabilities to fix issue of upgrade video icon coming on
dialing emergency number in wcdma mode.

Change-Id: I4962bbc832c9b6526fb1de87498fc6fc7eb3e139
CRs-Fixed: 1098780

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

diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 8af8835..e93ecda 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -499,11 +499,11 @@
         final boolean showUpgradeToVideo =
                 /* When useExt is true, show upgrade button for an active/held
                    call if the call has either voice or video capabilities */
+                ((isCallActive || isCallOnHold) &&
                 ((useExt && QtiCallUtils.hasVoiceOrVideoCapabilities(call)) ||
                 /* When useCustomVideoUi is true, show upgrade button for an active/held
                    voice call only if the current call has video capabilities */
-                (useCustomVideoUi && !isVideo && hasVideoCallCapabilities(call))
-                && (isCallActive || isCallOnHold)) ||
+                (useCustomVideoUi && !isVideo && hasVideoCallCapabilities(call)))) ||
                 /* When useExt and custom UI are false, default to Google behaviour */
                 (!isVideo && !useExt && !useCustomVideoUi && hasVideoCallCapabilities(call));