Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b848a83c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Crash invalid FGS notifications" into sc-dev am: bf79a4c4 am: 4a29b131 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15223344

Change-Id: Ie604ab31b9d2779461e0aed1ea46ed6bd290ca13
parents 64db2da3 4a29b131

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

+3 −1
Original line number Diff line number Diff line
@@ -6194,8 +6194,10 @@ public class NotificationManagerService extends SystemService { 
        // 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;

        }