diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-19 01:38:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-19 01:38:34 +0000 |
| commit | d55b09c780dad2fdbc851e60c7fd05f531b10425 (patch) | |
| tree | 985185fd12e676d53bbe361968e69242d087d482 /java/com/android/dialer/app/calllog | |
| parent | 7393d2481003d0df31d061ddb8973cc0f39ac487 (diff) | |
| parent | f539f7885be23d3aff470e573c70d52db3b2a878 (diff) | |
Merge changes I4e2ee34f,Ic53ca21f,I68d16567
* changes:
Bubble v2 logging.
Ensure we do not have a null data string before checking for Duo
Bug: 70402588
Diffstat (limited to 'java/com/android/dialer/app/calllog')
| -rw-r--r-- | java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index babf1f8ca..2baf117dc 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -740,7 +740,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder } boolean isBlockedOrSpam = blockId != null || (isSpamFeatureEnabled && isSpam); - + if (!isBlockedOrSpam && info != null && UriUtils.isEncodedContactUri(info.lookupUri)) { createNewContactButtonView.setTag( IntentProvider.getAddContactIntentProvider( @@ -1034,8 +1034,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder && intent.getIntExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, -1) == VideoProfile.STATE_BIDIRECTIONAL) { Logger.get(mContext).logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG); - } - if (intent.getDataString().contains(DuoConstants.PACKAGE_NAME)) { + } else if (intent.getDataString() != null + && intent.getDataString().contains(DuoConstants.PACKAGE_NAME)) { Logger.get(mContext).logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_INSTALL); } |