Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f21a3796 authored by Eric Sandness's avatar Eric Sandness Committed by android-build-merger
Browse files

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

am: 9f36c26f

Change-Id: Ie798dde6593e6d0786f541a5c2512eb388ca5554
parents b63f23a0 9f36c26f

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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -11843,6 +11843,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 














    @Override















    public boolean isDeviceProvisioned() {













        enforceManageUsers();















        synchronized (this) {















            return getUserDataUnchecked(UserHandle.USER_SYSTEM).mUserSetupComplete;















        }