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

Merge "Limit toasts posted by system" into rvc-dev am: 210deda3ef

Browse Source 
Change-Id: I3e1f071cf1239a9b3f7b6b48bf173f562f6551b3
This commit is contained in:
Julia Reynolds
2020-03-27 14:46:21 +00:00
committed by Automerger Merge Worker
parent 9207b46640 210deda3ef
commit 94d17914cd
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,7 @@ import android.annotation.CallbackExecutor;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.UserIdInt;
import android.annotation.WorkerThread; import android.annotation.WorkerThread;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManagerInternal; import android.app.ActivityManagerInternal;
@@ -2842,20 +2843,18 @@ public class NotificationManagerService extends SystemService {
record = mToastQueue.get(index); record = mToastQueue.get(index);
record.update(duration); record.update(duration);
} else { } else {
// Limit the number of toasts that any given package except the android // Limit the number of toasts that any given package can enqueue.
// package can enqueue. Prevents DOS attacks and deals with leaks. // Prevents DOS attacks and deals with leaks.
if (!isSystemToast) { int count = 0;
int count = 0; final int N = mToastQueue.size();
final int N = mToastQueue.size(); for (int i = 0; i < N; i++) {
for (int i = 0; i < N; i++) { final ToastRecord r = mToastQueue.get(i);
final ToastRecord r = mToastQueue.get(i); if (r.pkg.equals(pkg)) {
if (r.pkg.equals(pkg)) { count++;
count++; if (count >= MAX_PACKAGE_NOTIFICATIONS) {
if (count >= MAX_PACKAGE_NOTIFICATIONS) { Slog.e(TAG, "Package has already posted " + count
Slog.e(TAG, "Package has already posted " + count + " toasts. Not showing more. Package=" + pkg);
+ " toasts. Not showing more. Package=" + pkg); return;
return;
}
} }
} }
} }