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

Commit 1414abec 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:... 

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

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

Change-Id: I89c4e841cfc1e9116d7579ac30cb2215ccaecc2f
parents ac829811 5b905266

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

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

            }

        }

        }

        final String adminPkg = admin.getPackageName();

        final String adminPkg = admin.getPackageName();

        mInjector.binderWithCleanCallingIdentity(() -> {

            try {

            try {

                // Install the profile owner if not present.

                // Install the profile owner if not present.

                if (!mIPackageManager.isPackageAvailable(adminPkg, userId)) {

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

                Slogf.wtf(LOG_TAG, e, "Failed to install admin package %s for user %d",

                        adminPkg, userId);

                        adminPkg, userId);

            }

            }

        });

















        // Set admin.







        // Set admin.











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







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