commit 9f36c26f83cbb29c947c681c750340401e62e768
author Eric Sandness <sandness@google.com> Tue Mar 27 12:25:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 12:25:53 2018 +0000
tree 29c8d761e60e2292b7e92c74e764f63d0c22721b
parent e8c16570d4c2b169df3698fd5ea410d84b9a5617
parent df30c7d2e0bd59a1ed92d63bd1b4dc9c320e2ab6

Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev

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

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 8dbb9f0..3015398 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -8755,6 +8755,7 @@
      * @hide
      */
     @SystemApi
+    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
     public boolean isDeviceProvisioned() {
         try {
             return mService.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 44634ab..1e216a3 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -11843,6 +11843,7 @@
 
     @Override
     public boolean isDeviceProvisioned() {
+        enforceManageUsers();
         synchronized (this) {
             return getUserDataUnchecked(UserHandle.USER_SYSTEM).mUserSetupComplete;
         }