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

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

Browse Source 
am: 59b4e5b6c4

Change-Id: I0661ae34df7dcca80b394e9751ce91dd2f5f25e1
This commit is contained in:
Alison Cichowlas
2017-06-07 00:11:08 +00:00
committed by android-build-merger
parent 8f3b60dfb6 59b4e5b6c4
commit a90a144ef3
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -145,6 +145,15 @@ public class AppNotificationSettings extends NotificationSettingsBase {
} }
private void populateChannelList() { 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()) { if (mChannelGroupList.isEmpty()) {
PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext()); PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
groupCategory.setTitle(R.string.notification_channels); groupCategory.setTitle(R.string.notification_channels);