diff options
| author | 2018-03-27 12:25:53 +0000 | |
|---|---|---|
| committer | 2018-03-27 12:25:53 +0000 | |
| commit | 9f36c26f83cbb29c947c681c750340401e62e768 (patch) | |
| tree | 29c8d761e60e2292b7e92c74e764f63d0c22721b | |
| parent | e8c16570d4c2b169df3698fd5ea410d84b9a5617 (diff) | |
| parent | df30c7d2e0bd59a1ed92d63bd1b4dc9c320e2ab6 (diff) | |
Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 1 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8dbb9f0473a6..3015398e97ee 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/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(); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 44634ab9d9e4..1e216a3cff86 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 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public boolean isDeviceProvisioned() { + enforceManageUsers(); synchronized (this) { return getUserDataUnchecked(UserHandle.USER_SYSTEM).mUserSetupComplete; } |