Add elements to existing mChannelsList instead of overwriting in setChannels

This means that mChannels, which is initialized as an empty list upon declaration, cannot be overwritten (thus cannot be null) by a call to setChannels. This passes through the same channels in the list but does not keep the passed in structure.

Bug: 381131846
Flag: EXEMPT non-behavioral change
Test: NotificationManagerTest, NotificationManagerServiceTest, NotifictionChannelGroupTest
Change-Id: If8f564012b4000109734abab2339f776112cd146

1 files changed, 6 insertions, 5 deletions

diff --git a/core/java/android/app/NotificationChannelGroup.java b/core/java/android/app/NotificationChannelGroup.java
index d48cede04680..06b492c417d8 100644
--- a/core/java/android/app/NotificationChannelGroup.java
+++ b/core/java/android/app/NotificationChannelGroup.java
@@ -221,7 +221,10 @@ public final class NotificationChannelGroup implements Parcelable {
      * @hide
      */
     public void setChannels(List<NotificationChannel> channels) {
-        mChannels = channels;
+        mChannels.clear();
+        if (channels != null) {
+            mChannels.addAll(channels);
+        }
     }
 
     /**
@@ -331,10 +334,8 @@ public final class NotificationChannelGroup implements Parcelable {
         NotificationChannelGroup cloned = new NotificationChannelGroup(getId(), getName());
         cloned.setDescription(getDescription());
         cloned.setBlocked(isBlocked());
-        if (mChannels != null) {
-            for (NotificationChannel c : mChannels) {
-                cloned.addChannel(c.copy());
-            }
+        for (NotificationChannel c : mChannels) {
+            cloned.addChannel(c.copy());
         }
         cloned.lockFields(mUserLockedFields);
         return cloned;