Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kholoud Mohamed
2021-03-31 11:30:36 +00:00
committed by Android (Google) Code Review
parent dfe477f26d ee0e8fbea6
commit 0c6dd4d8e2
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -16975,9 +16975,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final long identity = Binder.clearCallingIdentity(); final long identity = Binder.clearCallingIdentity();
try { try {
// TODO(b/178187130): This check fails silent provisioning, uncomment once silent
// provisioning is no longer used.
if (false) {
int result = checkProvisioningPreConditionSkipPermission( int result = checkProvisioningPreConditionSkipPermission(
ACTION_PROVISION_MANAGED_DEVICE, deviceAdmin.getPackageName()); ACTION_PROVISION_MANAGED_DEVICE, deviceAdmin.getPackageName());
if (result != CODE_OK) { if (result != CODE_OK) {
@@ -16985,8 +16982,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
PROVISIONING_RESULT_PRE_CONDITION_FAILED, PROVISIONING_RESULT_PRE_CONDITION_FAILED,
"Provisioning preconditions failed with result: " + result); "Provisioning preconditions failed with result: " + result);
} }
}
setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime()); setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime());
setLocale(provisioningParams.getLocale()); setLocale(provisioningParams.getLocale());