Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() (c7b18342) · Commits · e / os / android_frameworks_base

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