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

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

Merge "Don't check device_provisioned on Wear devices in... 

Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
parents 84aa5a86 c7b18342

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

+4 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    private void setDeviceOwnerSystemPropertyLocked() {

        // Device owner may still be provisioned, do not set the read-only system property yet.

        if (mInjector.settingsGlobalGetInt(Settings.Global.DEVICE_PROVISIONED, 0) == 0) {

        // Wear devices don't set device_provisioned until the device is paired, so allow

        // device_owner property to be set without that.

        if (!mIsWatch

                && mInjector.settingsGlobalGetInt(Settings.Global.DEVICE_PROVISIONED, 0) == 0) {

            return;

        }

        // Still at the first stage of CryptKeeper double bounce, mOwners.hasDeviceOwner is