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 | |
| 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')
| -rw-r--r-- | java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java | 6 | ||||
| -rw-r--r-- | java/com/android/dialer/logging/dialer_impression.proto | 21 |
2 files changed, 23 insertions, 4 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); } diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto index aed66251a..2d2eebf67 100644 --- a/java/com/android/dialer/logging/dialer_impression.proto +++ b/java/com/android/dialer/logging/dialer_impression.proto @@ -12,7 +12,7 @@ message DialerImpression { // Event enums to be used for Impression Logging in Dialer. // It's perfectly acceptable for this enum to be large // Values should be from 1000 to 100000. - // Next Tag: 1311 + // Next Tag: 1320 enum Type { UNKNOWN_AOSP_EVENT_TYPE = 1000; @@ -625,5 +625,24 @@ message DialerImpression { DUO_CALL_LOG_SET_UP_INSTALL = 1308; DUO_CALL_LOG_SET_UP_ACTIVATE = 1309; DUO_CALL_LOG_INVITE = 1310; + + // Bubble primary button first click to expand bubble + BUBBLE_V2_CLICK_TO_EXPAND = 1311; + // Bubble primary button second click to collapse bubble + BUBBLE_V2_CLICK_TO_COLLAPSE = 1312; + // User return to call from bubble call action menu + BUBBLE_V2_RETURN_TO_CALL = 1313; + // User muted call from bubble call action menu + BUBBLE_V2_MUTE_CALL = 1314; + // User unmuted call from bubble call action menu + BUBBLE_V2_UNMUTE_CALL = 1315; + // User choose audio route speakerphone from bubble call action menu + BUBBLE_V2_SPEAKERPHONE = 1316; + // User choose audio route wired or earpiece from bubble call action menu + BUBBLE_V2_WIRED_OR_EARPIECE = 1317; + // User choose audio route bluetooth from bubble call action menu + BUBBLE_V2_BLUETOOTH = 1318; + // User ended call from bubble call action menu + BUBBLE_V2_END_CALL = 1319; } } |