summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-05-06 12:43:57 -0700
committerAnthony Lee <anthonylee@google.com>2015-05-07 07:07:20 -0700
commit8ab315cc3a567e4739b791744916df5f8b7098c7 (patch)
treea86d8f0880aec7a0eb818d3d6072502d71806940 /InCallUI
parented8488149b8d842ee86b4c209d0f39d71f004146 (diff)
Fix NPE for video card when VT not active
Change-Id: I5a88be1a3d463fd2570b98144f9caa626c8dc3bb
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/CallCardFragment.java3
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();