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

Commit 8e921c62 authored by Julia Reynolds's avatar Julia Reynolds Committed by Justin Dunlap
Browse files

DO NOT MERGE Crash invalid FGS notifications 

Test: CTS, ActivityManagerProcessStateTest
Fixes: 191981182
Change-Id: I13a0202b25c8118db47edba11a93c1939c94b392
Merged-In: I13a0202b25c8118db47edba11a93c1939c94b392
(cherry picked from commit 6f657f8f)
(cherry picked from commit b6b2906e)
Merged-In: I13a0202b25c8118db47edba11a93c1939c94b392
parent 0ef91007

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

+5 −2
Original line number Diff line number Diff line
@@ -4755,8 +4755,11 @@ public class NotificationManagerService extends SystemService { 
        try {

            fixNotification(notification, pkg, userId);



        } catch (NameNotFoundException e) {

            Slog.e(TAG, "Cannot create a context for sending app", e);

        } catch (Exception e) {

            if (notification.isForegroundService()) {

                throw new SecurityException("Invalid FGS notification", e);

            }

            Slog.e(TAG, "Cannot fix notification", e);

            return;

        }