Merge "Consolidate logic for 'recent notifications'" into pi-dev am: ad06c5f603 (0dfae734) · Commits · e / os / android_frameworks_base

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -1877,13 +1877,13 @@ public class NotificationManagerService extends SystemService {
		return newSuppressedVisualEffects;
		}

		// TODO: log visual differences, not just audible ones
		@GuardedBy("mNotificationLock")
		protected void maybeRecordInterruptionLocked(NotificationRecord r) {
		if (r.isInterruptive()) {
		mAppUsageStats.reportInterruptiveNotification(r.sbn.getPackageName(),
		r.getChannel().getId(),
		getRealUserId(r.sbn.getUserId()));
		logRecentLocked(r);
		}
		}

		@@ -4344,10 +4344,6 @@ public class NotificationManagerService extends SystemService {

		mNotificationsByKey.put(n.getKey(), r);

		if (!r.isUpdate) {
		logRecentLocked(r);
		}

		// Ensure if this is a foreground service that the proper additional
		// flags are set.
		if ((notification.flags & Notification.FLAG_FOREGROUND_SERVICE) != 0) {