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

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

Merge "Added missing permission check to isPackageDeviceAdminOnAnyUser."

parents f89753c6 569ac173

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -17800,6 +17800,12 @@ public class PackageManagerService extends IPackageManager.Stub 
    @Override

    public boolean isPackageDeviceAdminOnAnyUser(String packageName) {

        final int callingUid = Binder.getCallingUid();

        if (checkUidPermission(android.Manifest.permission.MANAGE_USERS, callingUid)

                != PERMISSION_GRANTED) {

            EventLog.writeEvent(0x534e4554, "128599183", -1, "");

            throw new SecurityException(android.Manifest.permission.MANAGE_USERS

                    + " permission is required to call this API");

        }

        if (getInstantAppPackageName(callingUid) != null

                && !isCallerSameApp(packageName, callingUid)) {

            return false;