From ee0e8fbea62ff260d89232926c1bde33b98b3af9 Mon Sep 17 00:00:00 2001
From: kholoud mohamed <kholoudm@google.com>
Date: Mon, 29 Mar 2021 15:40:10 +0100
Subject: [PATCH] Remove silent provisioning hack from DPMS

Fixes: 178187130
Test: atest android.devicepolicy.cts.DevicePolicyManagerTest
Change-Id: I18f23a7bf3686ed17f5aab479ed461d857d8a63c
---
 .../DevicePolicyManagerService.java             | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 44791b00d870e..5e3510f737189 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -16866,18 +16866,13 @@ 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) {
-                    throw new ServiceSpecificException(
-                            PROVISIONING_RESULT_PRE_CONDITION_FAILED,
-                            "Provisioning preconditions failed with result: " + result);
-                }
+            int result = checkProvisioningPreConditionSkipPermission(
+                    ACTION_PROVISION_MANAGED_DEVICE, deviceAdmin.getPackageName());
+            if (result != CODE_OK) {
+                throw new ServiceSpecificException(
+                        PROVISIONING_RESULT_PRE_CONDITION_FAILED,
+                        "Provisioning preconditions failed with result: " + result);
             }
-
             setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime());
             setLocale(provisioningParams.getLocale());