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

Commit 5e3ef6a1 authored by Varun Shah's avatar Varun Shah Committed by android-build-merger
Browse files

Added missing permission check to isPackageDeviceAdminOnAnyUser. 

am: 18e7dedf

Change-Id: I3cd02487a2f39775e86c22ed12fb0fae45198ba4
parents 21c4a584 18e7dedf

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

+6 −0
Original line number Diff line number Diff line
@@ -18913,6 +18913,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;