PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't iterate channel list in bgthread"

Browse Source
This commit is contained in:
Beverly Tai
2021-01-25 16:47:14 +00:00
committed by Android (Google) Code Review
parent e9d44254c7 857dfe131b
commit b6ec17e394
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
View File

@@ -59,7 +59,7 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre
private RestrictedSwitchPreference mAllNotificationsToggle; private RestrictedSwitchPreference mAllNotificationsToggle;
private PreferenceCategory mPreferenceCategory; private PreferenceCategory mPreferenceCategory;
private final List<NotificationChannel> mChannels = new ArrayList<>(); private List<NotificationChannel> mChannels = new ArrayList<>();
public AppChannelsBypassingDndPreferenceController( public AppChannelsBypassingDndPreferenceController(
Context context, Context context,
@@ -126,17 +126,18 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@Override @Override
protected Void doInBackground(Void... unused) { protected Void doInBackground(Void... unused) {
List<NotificationChannel> newChannelList = new ArrayList<>();
List<NotificationChannelGroup> mChannelGroupList = mBackend.getGroups(mAppRow.pkg, List<NotificationChannelGroup> mChannelGroupList = mBackend.getGroups(mAppRow.pkg,
mAppRow.uid).getList(); mAppRow.uid).getList();
mChannels.clear();
for (NotificationChannelGroup channelGroup : mChannelGroupList) { for (NotificationChannelGroup channelGroup : mChannelGroupList) {
for (NotificationChannel channel : channelGroup.getChannels()) { for (NotificationChannel channel : channelGroup.getChannels()) {
if (!isConversation(channel)) { if (!isConversation(channel)) {
mChannels.add(channel); newChannelList.add(channel);
} }
} }
} }
Collections.sort(mChannels, CHANNEL_COMPARATOR); Collections.sort(newChannelList, CHANNEL_COMPARATOR);
mChannels = newChannelList;
return null; return null;
} }