From 115a7c9bffc79aff0e9d9215489f5b3f200c94b4 Mon Sep 17 00:00:00 2001 From: yueg Date: Fri, 30 Jun 2017 15:39:26 -0700 Subject: Fix 2 NPEs in CallLogAdapter. Test: cl/160695183 PiperOrigin-RevId: 160697524 Change-Id: I07127554a968d8dc36c02b522b7536438be7fb90 --- java/com/android/dialer/app/calllog/CallLogAdapter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index c4156d5c6..4942184a2 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -368,7 +368,9 @@ public class CallLogAdapter extends GroupingListAdapter } expandViewHolderActions(viewHolder); - if (viewHolder.videoCallButtonView.getVisibility() == View.VISIBLE + if (viewHolder.videoCallButtonView != null + && viewHolder.videoCallButtonView.getVisibility() == View.VISIBLE + && LightbringerComponent.get(mActivity).getLightbringer().getPackageName() != null && LightbringerComponent.get(mActivity) .getLightbringer() .getPackageName() -- cgit v1.2.3