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

DO NOT MERGE Crash invalid FGS notifications

Browse Source 
Test: CTS, ActivityManagerProcessStateTest
Fixes: 191981182
Change-Id: I13a0202b25c8118db47edba11a93c1939c94b392
Merged-In: I13a0202b25c8118db47edba11a93c1939c94b392
(cherry picked from commit 6f657f8f5b)
This commit is contained in:
Julia Reynolds
2021-07-07 16:19:44 -04:00
parent 08f8988bc3
commit b6b2906ea6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4789,8 +4789,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;
} }