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

Commit 150a584a authored by Greg Plesur's avatar Greg Plesur Committed by android-build-merger
Browse files

Allow any device with a device_owner to execute... 

Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am: 735b4dc0 am: d78a0d21
am: 82a37932

Change-Id: I3f7fe9ba2c572eb0dda23386a62c50f58a6a08f9
parents a51ae12b 82a37932

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

+8 −5
Original line number Diff line number Diff line
@@ -1886,11 +1886,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    }



    private void setDeviceOwnerSystemPropertyLocked() {

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

        // 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) {

        final boolean deviceProvisioned =

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

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

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

        // 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;

        }

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