Merge "Fix NPE for video card when VT not active" into mnc-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 2acabd694..499f46417 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -311,6 +311,9 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
         // Retrieve here since at fragment creation time the incoming video view is not inflated.
         final View videoView = getView().findViewById(R.id.incomingVideo);
+        if (videoView == null) {
+            return;
+        }
 
         // Determine how much space there is below or to the side of the call card.
         final float spaceBesideCallCard = getSpaceBesideCallCard();