From 4c03fbdae402b836f2612658b3cede368eeb1dc1 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Fri, 14 Jul 2017 14:50:36 -0700
Subject: Fix NPE when user click on call log.

This is caused by null tag of videoCallButtonView when expanding action view.

Bug: 63710739
Test: none
PiperOrigin-RevId: 162011496
Change-Id: If592be8cd9b05c369e2ff8b51610d93af48834f1
---
 .../android/dialer/app/calllog/CallLogAdapter.java | 30 ++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'java/com/android/dialer')

diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 41c9d6003..86590ace6 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -368,20 +368,30 @@ public class CallLogAdapter extends GroupingListAdapter
             }
             expandViewHolderActions(viewHolder);
 
-            if (viewHolder.videoCallButtonView != null
-                && viewHolder.videoCallButtonView.getVisibility() == View.VISIBLE
-                && LightbringerComponent.get(mActivity).getLightbringer().getPackageName() != null
-                && LightbringerComponent.get(mActivity)
-                    .getLightbringer()
-                    .getPackageName()
-                    .equals(
-                        ((IntentProvider) viewHolder.videoCallButtonView.getTag())
-                            .getIntent(mActivity)
-                            .getPackage())) {
+            if (isLightbringerCallButtonVisible(viewHolder.videoCallButtonView)) {
               CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
             }
           }
         }
+
+        private boolean isLightbringerCallButtonVisible(View videoCallButtonView) {
+          if (videoCallButtonView == null) {
+            return false;
+          }
+          if (videoCallButtonView.getVisibility() != View.VISIBLE) {
+            return false;
+          }
+          IntentProvider intentProvider = (IntentProvider) videoCallButtonView.getTag();
+          if (intentProvider == null) {
+            return false;
+          }
+          String packageName =
+              LightbringerComponent.get(mActivity).getLightbringer().getPackageName();
+          if (packageName == null) {
+            return false;
+          }
+          return packageName.equals(intentProvider.getIntent(mActivity).getPackage());
+        }
       };
 
   private void checkMarkCallLogEntry(CallLogListItemViewHolder viewHolder) {
-- 
cgit v1.2.3