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

Commit 9f36c26f authored by Eric Sandness's avatar Eric Sandness Committed by Android (Google) Code Review
Browse files

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

parents e8c16570 df30c7d2

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -8755,6 +8755,7 @@ public class DevicePolicyManager { 
     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    public boolean isDeviceProvisioned() {

    public boolean isDeviceProvisioned() {

        try {

        try {

            return mService.isDeviceProvisioned();

            return mService.isDeviceProvisioned();

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

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
















    @Override







    @Override











    public boolean isDeviceProvisioned() {







    public boolean isDeviceProvisioned() {














        enforceManageUsers();











        synchronized (this) {







        synchronized (this) {











            return getUserDataUnchecked(UserHandle.USER_SYSTEM).mUserSetupComplete;







            return getUserDataUnchecked(UserHandle.USER_SYSTEM).mUserSetupComplete;











        }







        }