Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16e8c06d authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge "Only clone channel when necessary" into main

parents 01361d90 c646db1f

services/core/java/com/android/server/notification/NotificationManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -12275,7 +12275,7 @@ public class NotificationManagerService extends SystemService { 
                    smartReplies = null;

                }

            }

            NotificationChannel effectiveChannel = record.getChannel().copy();

            NotificationChannel effectiveChannel = record.getChannel();

            if (notificationClassificationUi()) {

                // special handling for a notification's channel visibility when bundled: if the

                // notification's original channel had a more strict visibility than the current
@@ -12285,6 +12285,7 @@ public class NotificationManagerService extends SystemService { 
                    int currentChannelVis = record.getChannel().getLockscreenVisibility();

                    if (currentChannelVis == VISIBILITY_NO_OVERRIDE

                            || record.getOriginalChannelVisibility() < currentChannelVis) {

                        effectiveChannel = record.getChannel().copy();

                        effectiveChannel.setLockscreenVisibility(

                                record.getOriginalChannelVisibility());

                    }