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

Commit 06efa9fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use the correct uid for delegate cancelations"

parents 95b1b946 17f17cbd

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

+2 −2
Original line number Diff line number Diff line
@@ -2384,7 +2384,7 @@ public class NotificationManagerService extends SystemService { 
                    Binder.getCallingUid(), userId, true, false, "cancelNotificationWithTag", pkg);



            // ensure opPkg is delegate if does not match pkg

            resolveNotificationUid(opPkg, pkg, Binder.getCallingUid(), userId);

            int uid = resolveNotificationUid(opPkg, pkg, Binder.getCallingUid(), userId);



            // if opPkg is not the same as pkg, make sure the notification given was posted

            // by opPkg
@@ -2405,7 +2405,7 @@ public class NotificationManagerService extends SystemService { 
            // summaries.

            final int mustNotHaveFlags = isCallingUidSystem() ? 0 :

                    (FLAG_FOREGROUND_SERVICE | FLAG_AUTOGROUP_SUMMARY);

            cancelNotification(Binder.getCallingUid(), Binder.getCallingPid(), pkg, tag, id, 0,

            cancelNotification(uid, Binder.getCallingPid(), pkg, tag, id, 0,

                    mustNotHaveFlags, false, userId, REASON_APP_CANCEL, null);

        }