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

Merge "Don't prevent notification updates in DOS protection."

Browse Source
This commit is contained in:
Vladimir Marko
2015-06-17 09:04:33 +00:00
committed by Gerrit Code Review
parent f35f66a86b d9f4c95b7d
commit dc22cfed5d
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1772,6 +1772,9 @@ public class NotificationManagerService extends SystemService {
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
final NotificationRecord r = mNotificationList.get(i); final NotificationRecord r = mNotificationList.get(i);
if (r.sbn.getPackageName().equals(pkg) && r.sbn.getUserId() == userId) { if (r.sbn.getPackageName().equals(pkg) && r.sbn.getUserId() == userId) {
if (r.sbn.getId() == id && TextUtils.equals(r.sbn.getTag(), tag)) {
break; // Allow updating existing notification
}
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
@@ -2789,19 +2792,8 @@ public class NotificationManagerService extends SystemService {
final int len = list.size(); final int len = list.size();
for (int i=0; i<len; i++) { for (int i=0; i<len; i++) {
NotificationRecord r = list.get(i); NotificationRecord r = list.get(i);
if (!notificationMatchesUserId(r, userId) || r.sbn.getId() != id) { if (notificationMatchesUserId(r, userId) && r.sbn.getId() == id &&
continue; TextUtils.equals(r.sbn.getTag(), tag) && r.sbn.getPackageName().equals(pkg)) {
}
if (tag == null) {
if (r.sbn.getTag() != null) {
continue;
}
} else {
if (!tag.equals(r.sbn.getTag())) {
continue;
}
}
if (r.sbn.getPackageName().equals(pkg)) {
return i; return i;
} }
} }