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

Commit 5b905266 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Proper fix for setDeviceOwner() permission check." into sc-v2-dev am: f70489f2 

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

Change-Id: I64e728a54e89c7151e80eecb75c89b77f53c889e
parents a488452f f70489f2

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

+14 −12
Original line number Diff line number Diff line
@@ -10633,6 +10633,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            }

        }

        final String adminPkg = admin.getPackageName();

        mInjector.binderWithCleanCallingIdentity(() -> {

            try {

                // Install the profile owner if not present.

                if (!mIPackageManager.isPackageAvailable(adminPkg, userId)) {
@@ -10646,6 +10647,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                Slogf.wtf(LOG_TAG, e, "Failed to install admin package %s for user %d",

                        adminPkg, userId);

            }

        });















        // Set admin.















        setActiveAdmin(profileOwner, /* refreshing= */ true, userId);