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

Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev

Browse Source 
am: 892cd3e1e6

Change-Id: I1805b23929a56b5d54c660db7fdc5383233b3fe4
This commit is contained in:
Shunta Sato
2017-06-16 01:56:11 +00:00
committed by android-build-merger
parent 69a4e37d19 892cd3e1e6
commit 769067fb99
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -53,6 +53,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -1186,6 +1187,6 @@ public class RankingHelper implements RankingConfig {
boolean showBadge = DEFAULT_SHOW_BADGE; boolean showBadge = DEFAULT_SHOW_BADGE;
ArrayMap<String, NotificationChannel> channels = new ArrayMap<>(); ArrayMap<String, NotificationChannel> channels = new ArrayMap<>();
ArrayMap<String, NotificationChannelGroup> groups = new ArrayMap<>(); Map<String, NotificationChannelGroup> groups = new ConcurrentHashMap<>();
} }
} }