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

Commit 5d89ccad authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge \"Check uid for notification policy access.\" into nyc-mr1-dev 

am: 48815309

Change-Id: I63134d80f8ddf6e1b375f37617404ede1aeb03b1
parents b61a5f1d 48815309

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

+5 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,7 @@ public class NotificationManagerService extends SystemService { 
                    android.Manifest.permission.MANAGE_NOTIFICATIONS)) {

                return;

            }

            checkCallerIsSameApp(pkg);

            if (!checkPolicyAccess(pkg)) {

                Slog.w(TAG, "Notification policy access denied calling " + method);

                throw new SecurityException("Notification policy access denied");
@@ -3655,6 +3656,10 @@ public class NotificationManagerService extends SystemService { 
        if (isCallerSystem()) {

            return;

        }

        checkCallerIsSameApp(pkg);

    }



    private static void checkCallerIsSameApp(String pkg) {

        final int uid = Binder.getCallingUid();

        try {

            ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(