Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev am: 9f36c26f83

am: f21a3796cb

Change-Id: Ib1879c2e4da140611ee08cb32afef7cd2c2198dc

core/java/android/app/admin/DevicePolicyManager.java

@@ -8755,6 +8755,7 @@ public class DevicePolicyManager {
      * @hide
      */
     @SystemApi
+    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
     public boolean isDeviceProvisioned() {
         try {
             return mService.isDeviceProvisioned();

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

@@ -11843,6 +11843,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
 
     @Override
     public boolean isDeviceProvisioned() {
+        enforceManageUsers();
         synchronized (this) {
             return getUserDataUnchecked(UserHandle.USER_SYSTEM).mUserSetupComplete;
         }