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

Commit 287971d6 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Make sure DO user is running even if caller is shell/root. 

Bug 23827706
Bug 23994401

Change-Id: Ie2fbc3ab07901e3d0a9898c910c69d993583084e
parent cb150cd8

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

+4 −4
Original line number Diff line number Diff line
@@ -4685,7 +4685,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            throw new IllegalStateException("Trying to set the device owner, but device owner "

                    + "is already set.");

        }

        // STOPSHIP Make sure the DO user is running

        if (!mUserManager.isUserRunning(new UserHandle(userId))) {

            throw new IllegalStateException("User not running: " + userId);

        }



        int callingUid = Binder.getCallingUid();

        if (callingUid == Process.SHELL_UID || callingUid == Process.ROOT_UID) {

            if (!hasUserSetupCompleted(UserHandle.USER_OWNER)) {
@@ -4707,9 +4710,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            return;

        }

        // STOPSHIP check the caller UID with userId

        if (!mUserManager.isUserRunning(new UserHandle(userId))) {

            throw new IllegalStateException("User not running: " + userId);

        }



        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, null);