From eab86045e847f98cfad1feea9abf61d1104e99e2 Mon Sep 17 00:00:00 2001
From: Rohan Shah <shahrk@google.com>
Date: Wed, 9 May 2018 19:55:30 -0700
Subject: [PATCH] [Notif] Limit shown events to manager.show

We have a slight over-fire of show events due to bindNotification being
called multiple times on density or user config changes. To be extra
careful, limit the show events to only get called with
perhapsShowBlockingHelper.

Bug:74609669
Test: Through adb logcat -b events + thru config changes
Change-Id: I0719052869e53ff1cba5030579daf512f324e99c
---
 .../statusbar/NotificationBlockingHelperManager.java         | 5 +++++
 .../src/com/android/systemui/statusbar/NotificationInfo.java | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java
index 20e5f86ee097c..1b613cbcaa411 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java
@@ -23,8 +23,10 @@ import android.service.notification.StatusBarNotification;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.systemui.Dependency;
 import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
+import com.android.systemui.statusbar.notification.NotificationCounters;
 import com.android.systemui.statusbar.phone.StatusBar;
 
 import java.util.Collections;
@@ -97,6 +99,9 @@ public class NotificationBlockingHelperManager {
             // We don't care about the touch origin (x, y) since we're opening guts without any
             // explicit user interaction.
             manager.openGuts(mBlockingHelperRow, 0, 0, menuRow.getLongpressMenuItem(mContext));
+
+            Dependency.get(MetricsLogger.class)
+                    .count(NotificationCounters.BLOCKING_HELPER_SHOWN, 1);
             return true;
         }
         return false;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
index ec49f436b7d0f..6d0ab2ef3f420 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
@@ -197,8 +197,6 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
         bindHeader();
         bindPrompt();
         bindButtons();
-
-        logBlockingHelperCounter(NotificationCounters.BLOCKING_HELPER_SHOWN);
     }
 
     private void bindHeader() throws RemoteException {