Merge "Add a new impression proto for same prefix call marked as spam."

2 files changed, 25 insertions, 5 deletions

diff --git a/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java b/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java
index a225072fd..5dbdf5e48 100644
--- a/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java
+++ b/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java
@@ -931,7 +931,7 @@ class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback {
 
     /**
      * Maximum number of photos to preload. If the cache size is 2Mb and the expected average size
-     * of a photo is 4kb, then this number should be 2Ma bugkb = 500.
+     * of a photo is 4kb, then this number should be 2Mb/4kb = 500.
      */
     private static final int MAX_PHOTOS_TO_PRELOAD = 100;
 
diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto
index cafcae3e3..3dd645e65 100644
--- a/java/com/android/dialer/logging/dialer_impression.proto
+++ b/java/com/android/dialer/logging/dialer_impression.proto
@@ -121,11 +121,15 @@ message DialerImpression {
 
     // From the service instead of an activity logs the number of times the
     // number was marked as Spam by the user (e.g from the feedback prompt)
-    SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_SPAM = 1026;
+    SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_SPAM = 1026
+
+        ;
 
     // From the service instead of an activity logs the number of times the
     // number was marked as Not Spam by the user (e.g from the feedback prompt)
-    SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_NOT_SPAM = 1027;
+    SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_NOT_SPAM = 1027
+
+        ;
 
     // User is in a active call i.e either incoming or outgoing
     // This is mainly so we can assign an impression event to a call event i.e
@@ -143,13 +147,17 @@ message DialerImpression {
     INCOMING_NON_SPAM_CALL = 1030;
 
     // Spam notifications shown despite throttling
-    SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1041;
+    SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1041
+
+        ;
 
     // Spam notifications not shown due to throttling
     SPAM_NOTIFICATION_NOT_SHOWN_AFTER_THROTTLE = 1042;
 
     // Non spam notifications shown despite throttling
-    NON_SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1043;
+    NON_SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1043
+
+        ;
 
     // Non spam notifications not shown due to throttling
     NON_SPAM_NOTIFICATION_NOT_SHOWN_AFTER_THROTTLE = 1044;
@@ -581,5 +589,17 @@ message DialerImpression {
     // Indicates that the number attempting to be assisted dialed had an
     // extension.
     ASSISTED_DIALING_CONSTRAINT_NUMBER_HAS_EXTENSION = 1289;
+
+    // User reports a same prefix call as spam from call history
+    REPORT_SAME_PREFIX_CALL_AS_SPAM_VIA_CALL_HISTORY =
+        1290
+
+        ;
+
+    // User reports a same prefix call as not spam from call history
+    REPORT_SAME_PREFIX_CALL_AS_NOT_SPAM_VIA_CALL_HISTORY =
+        1291
+
+        ;
   }
 }