diff options
| author | yueg <yueg@google.com> | 2017-06-30 15:39:26 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-07-10 10:44:33 -0700 |
| commit | 115a7c9bffc79aff0e9d9215489f5b3f200c94b4 (patch) | |
| tree | 73983063981e4dbeb52d3ee353ad500ea4cc28c6 /java/com/android/dialer/app | |
| parent | ad26445126c237c226d0b65fc1dad1b5ca41ef77 (diff) | |
Fix 2 NPEs in CallLogAdapter.
Test: cl/160695183
PiperOrigin-RevId: 160697524
Change-Id: I07127554a968d8dc36c02b522b7536438be7fb90
Diffstat (limited to 'java/com/android/dialer/app')
| -rw-r--r-- | java/com/android/dialer/app/calllog/CallLogAdapter.java | 4 |
1 files changed, 3 insertions, 1 deletions
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() |