diff options
author | Anthony Lee <anthonylee@google.com> | 2015-05-07 14:08:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 14:08:14 +0000 |
commit | 937224c6a5381de5ba1f0dc951c1a70d9c4ff91e (patch) | |
tree | 542e19a49e782e98bbdb882cef2be101b58e9adc /InCallUI | |
parent | d078826fc9fc20009d69ed041464209ed83e2e0f (diff) | |
parent | 8ab315cc3a567e4739b791744916df5f8b7098c7 (diff) |
Merge "Fix NPE for video card when VT not active" into mnc-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 3 |
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(); |