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

Commit bf6983a9 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Crash invalid FGS notifications am: b6b2906e 

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



Change-Id: I57b968cab49f7d3eef8028ea92d571d5b68489e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f44dc5ce b6b2906e

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

+5 −2
Original line number Diff line number Diff line
@@ -4836,8 +4836,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;

        }