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

Commit 1d6e63a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure notification is attached before checking its channel." into main

parents 88f56b7a 71cd7e3c

services/core/java/com/android/server/am/ActiveServices.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -830,7 +830,8 @@ public final class ActiveServices { 
            for (int i = 0; i < smap.mServicesByInstanceName.size(); i++) {

            for (int i = 0; i < smap.mServicesByInstanceName.size(); i++) {

                final ServiceRecord sr = smap.mServicesByInstanceName.valueAt(i);

                final ServiceRecord sr = smap.mServicesByInstanceName.valueAt(i);

                if (sr.appInfo.packageName.equals(pkg) && sr.isForeground) {

                if (sr.appInfo.packageName.equals(pkg) && sr.isForeground) {

                    if (Objects.equals(sr.foregroundNoti.getChannelId(), channelId)) {

                    if (sr.foregroundNoti != null

                            && Objects.equals(sr.foregroundNoti.getChannelId(), channelId)) {

                        if (DEBUG_FOREGROUND_SERVICE) {

                        if (DEBUG_FOREGROUND_SERVICE) {

                            Slog.d(TAG_SERVICE, "Channel u" + userId + "/pkg=" + pkg

                            Slog.d(TAG_SERVICE, "Channel u" + userId + "/pkg=" + pkg

                                    + "/channelId=" + channelId

                                    + "/channelId=" + channelId