Merge "Add logging for what listener canceled notif" into oc-mr1-dev (7874b601) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/EventLogTags.logtags

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ option java_package com.android.server
		# when a notification action button has been clicked
		27521 notification_action_clicked (key\|3),(action_index\|1),(lifespan\|1),(freshness\|1),(exposure\|1)
		# when a notification has been canceled
		27530 notification_canceled (key\|3),(reason\|1),(lifespan\|1),(freshness\|1),(exposure\|1)
		27530 notification_canceled (key\|3),(reason\|1),(lifespan\|1),(freshness\|1),(exposure\|1),(listener\|3)
		# replaces 27510 with a row per notification
		27531 notification_visibility (key\|3),(visibile\|1),(lifespan\|1),(freshness\|1),(exposure\|1),(rank\|1)
		# a notification emited noise, vibration, or light

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -3044,7 +3044,7 @@ public class NotificationManagerService extends SystemService {
		final NotificationRecord removed = findNotificationByKeyLocked(summaries.remove(pkg));
		if (removed != null) {
		boolean wasPosted = removeFromNotificationListsLocked(removed);
		cancelNotificationLocked(removed, false, REASON_UNAUTOBUNDLED, wasPosted);
		cancelNotificationLocked(removed, false, REASON_UNAUTOBUNDLED, wasPosted, null);
		}
		}
		}
		@@ -3686,7 +3686,7 @@ public class NotificationManagerService extends SystemService {
		.addTaggedData(MetricsEvent.NOTIFICATION_SNOOZED_CRITERIA,
		mSnoozeCriterionId == null ? 0 : 1));
		boolean wasPosted = removeFromNotificationListsLocked(r);
		cancelNotificationLocked(r, false, REASON_SNOOZED, wasPosted);
		cancelNotificationLocked(r, false, REASON_SNOOZED, wasPosted, null);
		updateLightsLocked();
		if (mSnoozeCriterionId != null) {
		mAssistants.notifyAssistantSnoozedLocked(r.sbn, mSnoozeCriterionId);
		@@ -4517,7 +4517,7 @@ public class NotificationManagerService extends SystemService {

		@GuardedBy("mNotificationLock")
		private void cancelNotificationLocked(NotificationRecord r, boolean sendDelete, int reason,
		boolean wasPosted) {
		boolean wasPosted, String listenerName) {
		final String canceledKey = r.getKey();

		// Record caller.
		@@ -4617,7 +4617,7 @@ public class NotificationManagerService extends SystemService {
		.setType(MetricsEvent.TYPE_DISMISS)
		.setSubtype(reason));
		EventLogTags.writeNotificationCanceled(canceledKey, reason,
		r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now));
		r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now), listenerName);
		}

		/**
		@@ -4660,7 +4660,7 @@ public class NotificationManagerService extends SystemService {

		// Cancel the notification.
		boolean wasPosted = removeFromNotificationListsLocked(r);
		cancelNotificationLocked(r, sendDelete, reason, wasPosted);
		cancelNotificationLocked(r, sendDelete, reason, wasPosted, listenerName);
		cancelGroupChildrenLocked(r, callingUid, callingPid, listenerName,
		sendDelete, null);
		updateLightsLocked();
		@@ -4786,7 +4786,7 @@ public class NotificationManagerService extends SystemService {
		notificationList.remove(i);
		mNotificationsByKey.remove(r.getKey());
		canceledNotifications.add(r);
		cancelNotificationLocked(r, sendDelete, reason, wasPosted);
		cancelNotificationLocked(r, sendDelete, reason, wasPosted, listenerName);
		}
		if (canceledNotifications != null) {
		final int M = canceledNotifications.size();
		@@ -4896,7 +4896,7 @@ public class NotificationManagerService extends SystemService {
		childSbn.getTag(), userId, 0, 0, reason, listenerName);
		notificationList.remove(i);
		mNotificationsByKey.remove(childR.getKey());
		cancelNotificationLocked(childR, sendDelete, reason, wasPosted);
		cancelNotificationLocked(childR, sendDelete, reason, wasPosted, listenerName);
		}
		}
		}