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

Commit 985a7670 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Check permission of package, not caller." into nyc-dev 

am: 69fccd62

* commit '69fccd62':
  Check permission of package, not caller.

Change-Id: Ia3d815f8601e93704b6377a279798189163b842b
parents a140391f 69fccd62

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

+10 −4
Original line number Diff line number Diff line
@@ -1852,11 +1852,17 @@ public class NotificationManagerService extends SystemService { 
        }



        private boolean checkPolicyAccess(String pkg) {

            try {

                int uid = getContext().getPackageManager().getPackageUidAsUser(

                        pkg, UserHandle.getCallingUserId());

                if (PackageManager.PERMISSION_GRANTED == ActivityManager.checkComponentPermission(

                    android.Manifest.permission.MANAGE_NOTIFICATIONS, Binder.getCallingUid(),

                        android.Manifest.permission.MANAGE_NOTIFICATIONS, uid,

                        -1, true)) {

                    return true;

                }

            } catch (NameNotFoundException e) {

                return false;

            }

            return checkPackagePolicyAccess(pkg) || mListeners.isComponentEnabledForPackage(pkg);

        }