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

Commit 49a505f4 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] [RESTRICT AUTOMERGE] Added missing permission check to... 

[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a5769 am: 0494ac65 am: 70b53479

Change-Id: I172642a771dcafa2d106886984cba3de7a87ae03
parents 26fda936 70b53479

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -15814,6 +15814,13 @@ public class PackageManagerService extends IPackageManager.Stub { 
















    @Override







    @Override











    public boolean isPackageDeviceAdminOnAnyUser(String packageName) {







    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");














        }











        return isPackageDeviceAdmin(packageName, UserHandle.USER_ALL);







        return isPackageDeviceAdmin(packageName, UserHandle.USER_ALL);











    }







    }