Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a90a144e authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
Browse files

Merge "If two groups are posted to settings, remove old group and log." into oc-dev am: 9fa5e66a

am: 59b4e5b6

Change-Id: I0661ae34df7dcca80b394e9751ce91dd2f5f25e1
parents 8f3b60df 59b4e5b6
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -145,6 +145,15 @@ public class AppNotificationSettings extends NotificationSettingsBase {
    }

    private void populateChannelList() {
        if (!mChannelGroups.isEmpty()) {
            // If there's anything in mChannelGroups, we've called populateChannelList twice.
            // Clear out existing channels and log.
            Log.w(TAG, "Notification channel group posted twice to settings - old size " +
                    mChannelGroups.size() + ", new size " + mChannelGroupList.size());
            for (Preference p : mChannelGroups) {
                getPreferenceScreen().removePreference(p);
            }
        }
        if (mChannelGroupList.isEmpty()) {
            PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
            groupCategory.setTitle(R.string.notification_channels);