commit 6f657f8f5b7d41af426d6cd8d60bfda6e12057c0
author Julia Reynolds <juliacr@google.com> Wed Jul 07 16:19:44 2021 -0400
committer Julia Reynolds <juliacr@google.com> Thu Jul 08 10:47:47 2021 -0400
tree 419de2e6103f83af6f8f86f1eeb87a78f32ec24d
parent 04781ed449768a218227f29d09a387610b4338b5

Crash invalid FGS notifications

Test: CTS, ActivityManagerProcessStateTest
Fixes: 191981182
Change-Id: I13a0202b25c8118db47edba11a93c1939c94b392

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 1bd5e72..3f73162 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -6194,8 +6194,10 @@
         // Fix the notification as best we can.
         try {
             fixNotification(notification, pkg, tag, id, userId);
-
         } catch (Exception e) {
+            if (notification.isForegroundService()) {
+                throw new SecurityException("Invalid FGS notification", e);
+            }
             Slog.e(TAG, "Cannot fix notification", e);
             return;
         }