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

am: 892cd3e1e6

Change-Id: Ie1011f5c27008e50cdf9430669ef1d3ceb1f38e9
This commit is contained in:
Shunta Sato
2017-06-16 01:56:05 +00:00
committed by android-build-merger

View File

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