Merge "Allow any device with a device_owner to execute...

    }

    }

    private void setDeviceOwnerSystemPropertyLocked() {

    private void setDeviceOwnerSystemPropertyLocked() {

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

        final boolean deviceProvisioned =

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

                mInjector.settingsGlobalGetInt(Settings.Global.DEVICE_PROVISIONED, 0) != 0;

        // device_owner property to be set without that.

        // If the device is not provisioned and there is currently no device owner, do not set the

        if (!mIsWatch

        // read-only system property yet, since Device owner may still be provisioned. For Wear

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

        // devices, if there is already a device owner then it's OK to set the property to true now,

        // regardless the provision state.

        final boolean isWatchWithDeviceOwner = mIsWatch && mOwners.hasDeviceOwner();

        if (!isWatchWithDeviceOwner && !deviceProvisioned) {

            return;

            return;

        }

        }

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

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