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

Commit 524f03e7 authored by Garvit Narang's avatar Garvit Narang Committed by Android (Google) Code Review
Browse files

Merge "Allow setting Device Owner after pairing"

parents 4280e22a acd2cba0

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

+1 −4
Original line number Diff line number Diff line
@@ -16530,9 +16530,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (!mUserManager.isUserRunning(new UserHandle(deviceOwnerUserId))) {

            return STATUS_USER_NOT_RUNNING;

        }

        if (mIsWatch && hasPaired(UserHandle.USER_SYSTEM)) {

            return STATUS_HAS_PAIRED;

        }















        boolean isHeadlessSystemUserMode = mInjector.userManagerIsHeadlessSystemUserMode();























@@ -16556,7 +16553,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {



























        if (isAdb) {















            // If shell command runs after user setup completed check device status. Otherwise, OK.













            if (mIsWatch || hasUserSetupCompleted(UserHandle.USER_SYSTEM)) {













            if (hasUserSetupCompleted(UserHandle.USER_SYSTEM)) {















                // DO can be setup only if there are no users which are neither created by default















                // nor marked as FOR_TESTING