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

Commit 95210c7e authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Fix security vulnerability in DPMS" into sc-dev am: 209f21d2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881810

Change-Id: I29bb678e7f3c8340f21375fb50461b67e52e0fb5
parents d40ad3a5 209f21d2

core/java/android/app/admin/DevicePolicyManager.java

+4 −0
Original line number Diff line number Diff line
@@ -13112,6 +13112,10 @@ public class DevicePolicyManager { 
     * @see #getCrossProfileCalendarPackages(ComponentName)

     * @hide

     */

    @RequiresPermission(anyOf = {

            permission.INTERACT_ACROSS_USERS_FULL,

            permission.INTERACT_ACROSS_USERS

    })

    public @Nullable Set<String> getCrossProfileCalendarPackages() {

        throwIfParentInstance("getCrossProfileCalendarPackages");

        if (mService != null) {

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -16016,9 +16016,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            return Collections.emptyList();

        }

        Preconditions.checkArgumentNonnegative(userHandle, "Invalid userId");













        final CallerIdentity caller = getCallerIdentity();













        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userHandle));













        Preconditions.checkCallAuthorization(













                hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)













                        || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS_FULL));





























        synchronized (getLockObject()) {















            final ActiveAdmin admin = getProfileOwnerAdminLocked(userHandle);