diff options
| author | roldenburg <roldenburg@google.com> | 2017-12-18 15:58:29 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2017-12-18 16:22:52 -0800 |
| commit | b35b0e20a9902a9c39d2c7ed7078e05d60ee633b (patch) | |
| tree | 56c200befa7ca3113585cca5c14ba2807e84bd1e /java/com | |
| parent | 9a8eb850c1a434642e6ced7a0ce7727735d6f1cf (diff) | |
Ensure we do not have a null data string before checking for Duo
Bug: 70794242
Test: GoogleCallLogAdapterTest
PiperOrigin-RevId: 179480604
Change-Id: Ic53ca21fb7e81390f45b116677df689d3d8fdb67
Diffstat (limited to 'java/com')
| -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); } |