commit a87364f60d8ae0082315f85d48b7f4eec692b1a2
author Julia Reynolds <juliacr@google.com> Wed Jul 07 16:19:44 2021 -0400
committer Justin Dunlap <justindunlap@google.com> Mon May 16 23:07:38 2022 +0000
tree 967993e9a5fb00b0b61d15c1384c33b6775aa1de
parent bc641236bd9472d206e6900332542c4b6d36e2a3

Crash invalid FGS notifications

Test: CTS, ActivityManagerProcessStateTest
Fixes: 191981182
Change-Id: I13a0202b25c8118db47edba11a93c1939c94b392
(cherry picked from commit 6f657f8f5b7d41af426d6cd8d60bfda6e12057c0)
(cherry picked from commit cb3c5c30092fb8527ff14118ccf04eae3a8363cb)
Merged-In: 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 6e87bab..f5efd33 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -5752,8 +5752,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;
         }