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

Commit 46da85a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fixed DPMS.setDeviceOwner() permission check."" into sc-v2-dev... 

Merge "Revert "Fixed DPMS.setDeviceOwner() permission check."" into sc-v2-dev am: 71fb7767 am: f25d6c00

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

Change-Id: I2caa090b7c629865132b0282239dd1259262c7d9
parents ab59f5c0 f25d6c00

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

+5 −7
Original line number Diff line number Diff line
@@ -8415,20 +8415,18 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            mDeviceAdminServiceController.startServiceForOwner(

                    admin.getPackageName(), userId, "set-device-owner");













            Slogf.i(LOG_TAG, "Device owner set: %s on user %d", admin.flattenToShortString(),













                    userId);













            Slogf.i(LOG_TAG, "Device owner set: " + admin + " on user " + userId);





























            if (setProfileOwnerOnCurrentUserIfNecessary















                    && mInjector.userManagerIsHeadlessSystemUserMode()) {















                int currentForegroundUser = getCurrentForegroundUserId();













                Slogf.i(LOG_TAG, "setDeviceOwner(): setting %s as profile owner on user %d",













                        admin.flattenToShortString(), currentForegroundUser);













                Slogf.i(LOG_TAG, "setDeviceOwner(): setting " + admin













                        + " as profile owner on user " + currentForegroundUser);















                // Sets profile owner on current foreground user since















                // the human user will complete the DO setup workflow from there.













                mInjector.binderWithCleanCallingIdentity(() -> manageUserUnchecked(













                        /* deviceOwner= */ admin, /* profileOwner= */ admin,













                manageUserUnchecked(/* deviceOwner= */ admin, /* profileOwner= */ admin,















                        /* managedUser= */ currentForegroundUser, /* adminExtras= */ null,













                        /* showDisclaimer= */ false));













                        /* showDisclaimer= */ false);















            }















            return true;















        }