diff options
| author | 2017-02-14 18:47:49 +0000 | |
|---|---|---|
| committer | 2017-02-14 18:47:53 +0000 | |
| commit | 723eac769eab985e052275f9e8ac4bc1965fed9f (patch) | |
| tree | 019450f5fec6d2ebe0ed167c518f802ff647b812 | |
| parent | 646b56c844d32ede56dfdf548bad744282d6f9f8 (diff) | |
| parent | 5108f1efa6e4db4fac3b83047917f35192488d11 (diff) | |
Merge "Use DevicePolicyData#mUserSetupComplete for DPM's isDeviceProvisioned."
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c68a1ae4f9d0..fb28bcfac3f1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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) { |