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

Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev

Browse Source
This commit is contained in:
Josh Tsuji
2020-07-01 15:09:30 +00:00
committed by Android (Google) Code Review
parent 93b7187b08 f5d082e611
commit 831ac87a9b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/notification/ShortcutHelper.java
View File

@@ -102,9 +102,13 @@ public class ShortcutHelper {
HashMap<String, String> shortcutBubbles = mActiveShortcutBubbles.get(packageName);
ArrayList<String> bubbleKeysToRemove = new ArrayList<>();
if (shortcutBubbles != null) {
// Copy to avoid a concurrent modification exception when we remove bubbles from
// shortcutBubbles.
final Set<String> shortcutIds = new HashSet<>(shortcutBubbles.keySet());
// If we can't find one of our bubbles in the shortcut list, that bubble needs
// to be removed.
for (String shortcutId : shortcutBubbles.keySet()) {
for (String shortcutId : shortcutIds) {
boolean foundShortcut = false;
for (int i = 0; i < shortcuts.size(); i++) {
if (shortcuts.get(i).getId().equals(shortcutId)) {