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

Merge "Add hack in provisionFullyManagedDevice to allow silent provisioning" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-03 17:04:33 +00:00
committed by Android (Google) Code Review
parent f2abb387f5 6183cfe1f6
commit 8d469cbcd7
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16220,12 +16220,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final long identity = Binder.clearCallingIdentity();
try {
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);
// 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);
}
}
setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime());
@@ -16333,6 +16337,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
private boolean setActiveAdminAndDeviceOwner(
@UserIdInt int userId, ComponentName adminComponent, String name) {
enableAndSetActiveAdmin(userId, userId, adminComponent);
return setDeviceOwner(adminComponent, name, userId);
// TODO(b/178187130): Directly set DO and remove the check once silent provisioning is no
// longer used.
if (getDeviceOwnerComponent(/* callingUserOnly= */ true) == null) {
return setDeviceOwner(adminComponent, name, userId);
}
return true;
}
}