Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev

This commit is contained in:
TreeHugger Robot
2022-05-12 19:50:55 +00:00
committed by Android (Google) Code Review

View File

@@ -4848,8 +4848,11 @@ public class NotificationManagerService extends SystemService {
try { try {
fixNotification(notification, pkg, userId); fixNotification(notification, pkg, userId);
} catch (NameNotFoundException e) { } catch (Exception e) {
Slog.e(TAG, "Cannot create a context for sending app", e); if (notification.isForegroundService()) {
throw new SecurityException("Invalid FGS notification", e);
}
Slog.e(TAG, "Cannot fix notification", e);
return; return;
} }