summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Studer <chstuder@google.com>2014-10-24 14:53:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-24 14:53:37 +0000
commit55abbfa0ed92a742506175ab50e983a80a9bdabe (patch)
treed8ebf13ce5248522ba48e07b90595ec70fd92695
parent3682ced751ee86f87a0af84a17f027e134c2f23e (diff)
parent81e5b5f2f85ea0a00c4ee51f648dbe37b25ab9bd (diff)
downloadframeworks_base-55abbfa0ed92a742506175ab50e983a80a9bdabe.zip
frameworks_base-55abbfa0ed92a742506175ab50e983a80a9bdabe.tar.gz
frameworks_base-55abbfa0ed92a742506175ab50e983a80a9bdabe.tar.bz2
Merge "NoMan: Log canceled notifications" into lmp-mr1-dev
-rw-r--r--services/core/java/com/android/server/EventLogTags.logtags2
-rw-r--r--services/core/java/com/android/server/notification/NotificationManagerService.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/EventLogTags.logtags b/services/core/java/com/android/server/EventLogTags.logtags
index f7925f0..eec97f3 100644
--- a/services/core/java/com/android/server/EventLogTags.logtags
+++ b/services/core/java/com/android/server/EventLogTags.logtags
@@ -71,6 +71,8 @@ option java_package com.android.server
27520 notification_clicked (key|3)
# when a notification action button has been clicked
27521 notification_action_clicked (key|3),(action_index|1)
+# when a notification has been canceled
+27530 notification_canceled (key|3),(reason|1)
# ---------------------------
# Watchdog.java
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index e0708cb..090967f 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -2372,6 +2372,8 @@ public class NotificationManagerService extends SystemService {
// Save it for users of getHistoricalNotifications()
mArchive.record(r.sbn);
+
+ EventLogTags.writeNotificationCanceled(r.getKey(), reason);
}
/**