commit 0493e1192490daea6992519ef47377502e0c4264
author Andalam Parthasarathi <andala@codeaurora.org> Wed Mar 22 18:24:18 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 10 05:08:42 2017 -0700
tree b3f577c82bc5e4388c4c62e0d1e6af37f20cd403
parent d8e8a3c47661f684a6b5a0b0264b6a7c2f6a0dfa

IMS-VT: Fix race condition

Due to race condition sometimes Preview window
struck for addCall on long run.
Issue happens when onUiShowing(true) is called
after onStateChange() enter video mode.
Fix: Checking for !VideoUtils.isVideoCall(mPrimaryCall).

Change-Id: I5b7b7c78b5705f9924f19b70a6669ee6138cc3c1
CRs-fixed: 2022020

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

diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index 324c786..f886836 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -1181,7 +1181,7 @@
             sShallTransmitStaticImage = sUseDefaultImage = mIsInBackground;
         }
 
-        if (mPrimaryCall == null || !VideoUtils.isActiveVideoCall(mPrimaryCall)) {
+        if (!VideoUtils.isVideoCall(mPrimaryCall)) {
             Log.w(this, "onUiShowing, received for non-active video call");
             return;
         }