Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Crash invalid FGS notifications" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-12 19:48:54 +00:00
committed by Android (Google) Code Review
parent 83b4fadcb7 26e9d222c1
commit e91ae52a85
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -5823,8 +5823,10 @@ public class NotificationManagerService extends SystemService {
// Fix the notification as best we can. // Fix the notification as best we can.
try { try {
fixNotification(notification, pkg, tag, id, userId); fixNotification(notification, pkg, tag, id, userId);
} catch (Exception e) { } catch (Exception e) {
if (notification.isForegroundService()) {
throw new SecurityException("Invalid FGS notification", e);
}
Slog.e(TAG, "Cannot fix notification", e); Slog.e(TAG, "Cannot fix notification", e);
return; return;
} }