From 0b6d652d20355549169f98f6d5c2d34ae63f26a0 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 15 Feb 2019 15:15:31 -0500
Subject: [PATCH] Fix doubling of channel listing

Test: toggle a notification group on/off
Change-Id: Ia93cf8084aee0c886a591301cba764975e5e0147
Fixes: 124384280
---
 .../settings/notification/AppNotificationSettings.java        | 2 +-
 .../settings/notification/NotificationSettingsBase.java       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 3977e452c42..774e2764af0 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -255,7 +255,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
                 int childCount = groupGroup.getPreferenceCount();
                 for (int i = 0; i < childCount; i++) {
                     Preference pref = groupGroup.getPreference(i);
-                    if (pref instanceof MasterCheckBoxPreference) {
+                    if (pref instanceof ChannelSummaryPreference) {
                         toRemove.add(pref);
                     }
                 }
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 19aeb51f340..b9fabb6600e 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -309,7 +309,9 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
                         return true;
                     }
                 });
-        parent.addPreference(channelPref);
+        if (parent.findPreference(channelPref.getKey()) == null) {
+            parent.addPreference(channelPref);
+        }
         return channelPref;
     }