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

import com.android.settings.widget.SwitchBar;

import com.android.settingslib.RestrictedSwitchPreference;

import java.text.Collator;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

    }

    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);