commit 857dfe131b4c1d67e5e7a000156b60bd5b7f76f1
author Beverly <beverlyt@google.com> Fri Jan 22 09:59:05 2021 -0500
committer Beverly Tai <beverlyt@google.com> Fri Jan 22 17:43:18 2021 +0000
tree 13190751d9cb318614f4f3234065645182cf7d08
parent 8e2ecd5918abda3f3399341e1f8500d090b901b2

Don't iterate channel list in bgthread

To avoid a ConcurrentModificationException

Fixes: 173674911
Test: manual
Change-Id: If35c6f66a2cfae7ee4a6f8e83dd70aa5877f8362

src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java

diff --git a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
index 684a27a..297bfdb 100644
--- a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
+++ b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
@@ -59,7 +59,7 @@
 
     private RestrictedSwitchPreference mAllNotificationsToggle;
     private PreferenceCategory mPreferenceCategory;
-    private final List<NotificationChannel> mChannels = new ArrayList<>();
+    private List<NotificationChannel> mChannels = new ArrayList<>();
 
     public AppChannelsBypassingDndPreferenceController(
             Context context,
@@ -126,17 +126,18 @@
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... unused) {
+                List<NotificationChannel> newChannelList = new ArrayList<>();
                 List<NotificationChannelGroup> mChannelGroupList = mBackend.getGroups(mAppRow.pkg,
                         mAppRow.uid).getList();
-                mChannels.clear();
                 for (NotificationChannelGroup channelGroup : mChannelGroupList) {
                     for (NotificationChannel channel : channelGroup.getChannels()) {
                         if (!isConversation(channel)) {
-                            mChannels.add(channel);
+                            newChannelList.add(channel);
                         }
                     }
                 }
-                Collections.sort(mChannels, CHANNEL_COMPARATOR);
+                Collections.sort(newChannelList, CHANNEL_COMPARATOR);
+                mChannels = newChannelList;
                 return null;
             }