commit 723eac769eab985e052275f9e8ac4bc1965fed9f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 14 18:47:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 18:47:53 2017 +0000
tree 019450f5fec6d2ebe0ed167c518f802ff647b812
parent 646b56c844d32ede56dfdf548bad744282d6f9f8
parent 5108f1efa6e4db4fac3b83047917f35192488d11

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

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index c68a1ae..fb28bcf 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 @@
 
     @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) {