From c87f1fbc35dcb19ed598008a88997e6547a1caca Mon Sep 17 00:00:00 2001
From: Android Dialer <noreply@google.com>
Date: Thu, 26 Apr 2018 15:38:04 -0700
Subject: Fix impression logging for spam blocking promo dialog shown in after
 call notification.

Test: N/A
PiperOrigin-RevId: 194465415
Change-Id: Ica9301f4315b549c343112a824c8f7c51213bb99
---
 .../app/calllog/BlockReportSpamListener.java       | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

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

diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
index 551791850..987615f5f 100644
--- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
+++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
@@ -206,11 +206,28 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic
   }
 
   private void showSpamBlockingPromoDialog() {
-    if (spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) {
-      spamBlockingPromoHelper.showSpamBlockingPromoDialog(
-          fragmentManager,
-          success -> spamBlockingPromoHelper.showModifySettingOnCompleteSnackbar(rootView, success),
-          null /* onDissmissListener */);
+    if (!spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) {
+      return;
     }
+
+    Logger.get(context).logImpression(DialerImpression.Type.SPAM_BLOCKING_CALL_LOG_PROMO_SHOWN);
+    spamBlockingPromoHelper.showSpamBlockingPromoDialog(
+        fragmentManager,
+        () -> {
+          Logger.get(context)
+              .logImpression(DialerImpression.Type.SPAM_BLOCKING_ENABLED_THROUGH_CALL_LOG_PROMO);
+          spamSettings.modifySpamBlockingSetting(
+              true,
+              success -> {
+                if (!success) {
+                  Logger.get(context)
+                      .logImpression(
+                          DialerImpression.Type
+                              .SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_CALL_LOG_PROMO);
+                }
+                spamBlockingPromoHelper.showModifySettingOnCompleteSnackbar(rootView, success);
+              });
+        },
+        null /* onDismissListener */);
   }
 }
-- 
cgit v1.2.3


From fa3cd3bfb14f4b8ac65c0ee6757bc78b40a73573 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Thu, 26 Apr 2018 20:21:01 -0700
Subject: Implement CequintPhoneLookup

Bug: 70989584
Test: CequintPhoneLookupTest
PiperOrigin-RevId: 194493484
Change-Id: I59f9b334f0a218e7ba1c34948db4ddbf11490df3
---
 java/com/android/dialer/app/calllog/CallLogFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 4e968f095..1e55c6358 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -449,7 +449,7 @@ public class CallLogFragment extends Fragment
     super.onStart();
     CequintCallerIdManager cequintCallerIdManager = null;
     if (CequintCallerIdManager.isCequintCallerIdEnabled(getContext())) {
-      cequintCallerIdManager = CequintCallerIdManager.createInstanceForCallLog();
+      cequintCallerIdManager = new CequintCallerIdManager();
     }
     contactInfoCache.setCequintCallerIdManager(cequintCallerIdManager);
   }
-- 
cgit v1.2.3