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

Commit c29c883d authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Remove silent provisioning hack from DPMS" into sc-dev am: 0c6dd4d8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018893

Change-Id: I37b99a1a391b1f4359677d797a5873fadfc1aedf
parents e237d2b2 0c6dd4d8

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());