commit 0f016f00c4c49d9e57b11fe76a3391a8a8948bfb
author Chris Wren <cwren@android.com> Thu Sep 14 12:05:12 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 14 12:05:12 2017 +0000
tree b58e9a20464d0ea22b7c1858608af74db3f059c8
parent 48686b6afb2befad77f409fe9936ff95daa9c727
parent 377ac6d94f764064dbd796df8965962244143c9b

Merge "don't log auto-expansion of notificaitons" into oc-mr1-dev

services/core/java/com/android/server/notification/NotificationManagerService.java

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index e578485..79a8dd8 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -756,9 +756,11 @@
                 if (r != null) {
                     r.stats.onExpansionChanged(userAction, expanded);
                     final long now = System.currentTimeMillis();
-                    MetricsLogger.action(r.getLogMaker(now)
-                            .setCategory(MetricsEvent.NOTIFICATION_ITEM)
-                            .setType(MetricsEvent.TYPE_DETAIL));
+                    if (userAction && expanded) {
+                        MetricsLogger.action(r.getLogMaker(now)
+                                .setCategory(MetricsEvent.NOTIFICATION_ITEM)
+                                .setType(MetricsEvent.TYPE_DETAIL));
+                    }
                     EventLogTags.writeNotificationExpansion(key,
                             userAction ? 1 : 0, expanded ? 1 : 0,
                             r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now));