Revert "Fixed DPMS.setDeviceOwner() permission check."

That change broke `dpm set-device-owner` on headless system user
because when the identiy was cleared, 'isAdb()` would return false.

Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation
Bug: 200810234

This reverts commit 1b7f98457f.

Change-Id: Ie12a58466af5fbfd834478aec98e0aef9384121f
This commit is contained in:
Felipe Leme
2021-09-29 13:01:11 -07:00
parent a59f1a8af5
commit a491ff684e

View File

@@ -8414,19 +8414,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
mDeviceAdminServiceController.startServiceForOwner(
admin.getPackageName(), userId, "set-device-owner");
Slogf.i(LOG_TAG, "Device owner set: %s on user %d", admin.flattenToShortString(),
userId);
Slogf.i(LOG_TAG, "Device owner set: " + admin + " on user " + userId);
if (mInjector.userManagerIsHeadlessSystemUserMode()) {
int currentForegroundUser = getCurrentForegroundUserId();
Slogf.i(LOG_TAG, "setDeviceOwner(): setting %s as profile owner on user %d",
admin.flattenToShortString(), currentForegroundUser);
Slogf.i(LOG_TAG, "setDeviceOwner(): setting " + admin
+ " as profile owner on user " + currentForegroundUser);
// Sets profile owner on current foreground user since
// the human user will complete the DO setup workflow from there.
mInjector.binderWithCleanCallingIdentity(() -> manageUserUnchecked(
/* deviceOwner= */ admin, /* profileOwner= */ admin,
manageUserUnchecked(/* deviceOwner= */ admin, /* profileOwner= */ admin,
/* managedUser= */ currentForegroundUser, /* adminExtras= */ null,
/* showDisclaimer= */ false));
/* showDisclaimer= */ false);
}
return true;
}