From a491ff684eb4974e18549630efe91d8725564780 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Wed, 29 Sep 2021 13:01:11 -0700 Subject: 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 1b7f98457f6903a52c394f830d457781eec05b13. Change-Id: Ie12a58466af5fbfd834478aec98e0aef9384121f --- .../server/devicepolicy/DevicePolicyManagerService.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 147889db3177..6e3c954278e2 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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; } -- cgit v1.2.3-59-g8ed1b