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

Commit 0c6dd4d8 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Remove silent provisioning hack from DPMS" into sc-dev

parents dfe477f2 ee0e8fbe

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

+6 −11
Original line number Diff line number Diff line
@@ -16975,9 +16975,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 














        final long identity = Binder.clearCallingIdentity();















        try {













            // TODO(b/178187130): This check fails silent provisioning, uncomment once silent













            //  provisioning is no longer used.













            if (false) {















            int result = checkProvisioningPreConditionSkipPermission(















                    ACTION_PROVISION_MANAGED_DEVICE, deviceAdmin.getPackageName());















            if (result != CODE_OK) {









@@ -16985,8 +16982,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                        PROVISIONING_RESULT_PRE_CONDITION_FAILED,















                        "Provisioning preconditions failed with result: " + result);















            }













            }



























            setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime());















            setLocale(provisioningParams.getLocale());