fixup! Support forwarding notification

Author: quh4gko8

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

@@ -636,8 +636,21 @@ boolean isCurrentlyInsistent() {
                 mNMP.getNotificationByKey(mVibrateNotificationKey));
     }
 
+    record MuteReasonFetchingParam(boolean shouldGetMuteReasonOnly) {
+        static MuteReasonFetchingParam of(boolean shouldGetMuteReasonOnly) {
+            return new MuteReasonFetchingParam(shouldGetMuteReasonOnly);
+        }
+    }
+
     @MuteReason int shouldMuteNotificationLocked(final NotificationRecord record,
             final Signals signals, boolean hasAudibleAlert) {
+        return shouldMuteNotificationLocked(record, signals, hasAudibleAlert,
+                MuteReasonFetchingParam.of(true));
+    }
+
+    @MuteReason int shouldMuteNotificationLocked(
+            final NotificationRecord record, final Signals signals, boolean hasAudibleAlert,
+            final MuteReasonFetchingParam muteReasonFetchingParam) {
         // Suppressed because no audible alert
         if (!hasAudibleAlert) {
             return MUTE_REASON_NOT_AUDIBLE;
@@ -681,9 +694,16 @@ boolean isCurrentlyInsistent() {
 
         // Suppressed for being too recently noisy
         final String pkg = record.getSbn().getPackageName();
-        if (mUsageStats.isAlertRateLimited(pkg)) {
-            Slog.e(TAG, "Muting recently noisy " + record.getKey());
-            return MUTE_REASON_RATE_LIMIT;
+        if (muteReasonFetchingParam.shouldGetMuteReasonOnly()) {
+            if (mUsageStats.isAlertRateLimitedQueryOnly(pkg)) {
+                Slog.i(TAG, "Recently noisy: " + record.getKey() + ", reason: was muted");
+                return MUTE_REASON_RATE_LIMIT;
+            }
+        } else {
+            if (mUsageStats.isAlertRateLimited(pkg)) {
+                Slog.e(TAG, "Muting recently noisy " + record.getKey());
+                return MUTE_REASON_RATE_LIMIT;
+            }
         }
 
         // A different looping ringtone, such as an incoming call is playing
@@ -704,7 +724,9 @@ boolean isCurrentlyInsistent() {
         if (isPoliteNotificationFeatureEnabled(record)) {
             // Notify the politeness strategy that an alerting notification is posted
             if (!isInsistentUpdate(record)) {
-                mStrategy.onNotificationPosted(record);
+                if (!muteReasonFetchingParam.shouldGetMuteReasonOnly()) {
+                    mStrategy.onNotificationPosted(record);
+                }
             }
 
             // Suppress if politeness is muted and it's not an update for insistent
@@ -1027,7 +1049,7 @@ boolean canShowLightsLocked(final NotificationRecord record, final Signals signa
         return true;
     }
 
-    String disableNotificationEffects(NotificationRecord record, int listenerHints) {
+    private String disableNotificationEffects(NotificationRecord record, int listenerHints) {
         if (mDisableNotificationEffects) {
             return "booleanState";
         }

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

@@ -9731,29 +9731,31 @@ private CensoredSendState getCensoredSendStateForNotification(NotificationRecord
             return CensoredSendState.DONT_SEND;
         }
 
-        // Handles reoccurring update notifications (fixes issues like status update spamming).
-        if (record.isUpdate && (record.getNotification().flags & FLAG_ONLY_ALERT_ONCE) != 0) {
-            if (DBG) Slog.d(TAG, "not sending censored notif due to original being " +
-                    "an update that only alerts once");
-            return CensoredSendState.DONT_SEND;
-        }
-
-        // Muted by listener
-        final String disableEffects = mAttentionHelper.disableNotificationEffects(record, mListenerHints);
-        if (disableEffects != null) {
-            if (DBG) Slog.d(TAG, "not sending censored notif due to disableEffects");
+        final var signals = new NotificationAttentionHelper.Signals(false, mListenerHints);
+        @NotificationAttentionHelper.MuteReason
+        final int muteReason = mAttentionHelper.shouldMuteNotificationLocked(record, signals, true,
+                NotificationAttentionHelper.MuteReasonFetchingParam.of(true));
+        if (DBG) Slog.d(TAG, "acquired mute reason: " + muteReason +
+                " for querying most noisy censored send state possible");
+        final CensoredSendState mostNoisyCensoredSendStateAllowed = switch (muteReason) {
+            // Do Not Disturb checks is done separately, see later comments.
+            case NotificationAttentionHelper.MUTE_REASON_DND,
+                 NotificationAttentionHelper.MUTE_REASON_NOT_MUTED
+                    -> CensoredSendState.SEND_NORMAL;
+            case NotificationAttentionHelper.MUTE_REASON_SILENT_UPDATE,
+                 NotificationAttentionHelper.MUTE_REASON_LISTENER_HINT,
+                 NotificationAttentionHelper.MUTE_REASON_GROUP_ALERT
+                    -> {
+                yield CensoredSendState.DONT_SEND;
+            }
+            default -> CensoredSendState.SEND_QUIET;
+        };
+        if (mostNoisyCensoredSendStateAllowed == CensoredSendState.DONT_SEND) {
+            if (DBG) Slog.d(TAG, "not sending censored notif: original notif is muted " +
+                    "with reason ineligible for forwarding");
             return CensoredSendState.DONT_SEND;
         }
 
-        // Suppressed because another notification in its group handles alerting
-        if (record.getSbn().isGroup()) {
-            if (record.getNotification().suppressAlertingDueToGrouping()) {
-                if (DBG) Slog.d(TAG, "not sending censored notif due another" +
-                        "notification in its group handles alerting");
-                return CensoredSendState.DONT_SEND;
-            }
-        }
-
         // Check lock screen display settings.
         if (!shouldShowNotificationOnKeyguardForUser(userId, record)) {
             if (DBG) Slog.d(TAG, "not sending censored notif due lock screen settings");
@@ -9776,6 +9778,10 @@ private CensoredSendState getCensoredSendStateForNotification(NotificationRecord
                     if (DBG) Slog.d(TAG, "using SEND_QUIET");
                     return CensoredSendState.SEND_QUIET;
                 }
+                if (mostNoisyCensoredSendStateAllowed == CensoredSendState.SEND_QUIET) {
+                    if (DBG) Slog.d(TAG, "using SEND_QUIET");
+                    return CensoredSendState.SEND_QUIET;
+                }
                 return CensoredSendState.SEND_NORMAL;
             case DONT_SEND: // fall through
             default:

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

@@ -110,6 +110,17 @@ public synchronized boolean isAlertRateLimited(String packageName) {
         return stats.isAlertRateLimited();
     }
 
+    /**
+     * Query when a notification wants to alert based on existing stats.
+     */
+    public synchronized boolean isAlertRateLimitedQueryOnly(String packageName) {
+        AggregatedStats stats = mStats.get(packageName);
+        if (stats == null) {
+            return false;
+        }
+        return stats.isAlertRateLimited();
+    }
+
     /**
      * Called when a notification is tentatively enqueued by an app, before rate checking.
      */