Merge "Fix doubling of channel listing"

src/com/android/settings/notification/AppNotificationSettings.java

@@ -252,7 +252,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);
                     }
                 }

src/com/android/settings/notification/NotificationSettingsBase.java

@@ -309,7 +309,9 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
                         return true;
                     }
                 });
+        if (parent.findPreference(channelPref.getKey()) == null) {
             parent.addPreference(channelPref);
+        }
         return channelPref;
     }