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

Commit 71fb7767 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 442864ca a491ff68

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

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

            mDeviceAdminServiceController.startServiceForOwner(

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

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

















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







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











                    userId);






























            if (setProfileOwnerOnCurrentUserIfNecessary







            if (setProfileOwnerOnCurrentUserIfNecessary











                    && mInjector.userManagerIsHeadlessSystemUserMode()) {







                    && mInjector.userManagerIsHeadlessSystemUserMode()) {











                int currentForegroundUser = getCurrentForegroundUserId();







                int currentForegroundUser = getCurrentForegroundUserId();











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







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











                        admin.flattenToShortString(), currentForegroundUser);







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











                // Sets profile owner on current foreground user since







                // Sets profile owner on current foreground user since











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







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











                mInjector.binderWithCleanCallingIdentity(() -> manageUserUnchecked(







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











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














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







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











                        /* showDisclaimer= */ false));







                        /* showDisclaimer= */ false);











            }







            }











            return true;







            return true;











        }







        }