Merge "Use DevicePolicyData#mUserSetupComplete for DPM's isDeviceProvisioned."

This commit is contained in:
TreeHugger Robot
2017-02-14 18:47:49 +00:00
committed by Android (Google) Code Review

View File

@@ -10042,7 +10042,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
@Override
public boolean isDeviceProvisioned() {
return !TextUtils.isEmpty(mInjector.systemPropertiesGet(PROPERTY_DEVICE_OWNER_PRESENT));
synchronized (this) {
return getUserDataUnchecked(UserHandle.USER_SYSTEM).mUserSetupComplete;
}
}
private void removePackageIfRequired(final String packageName, final int userId) {