Merge "Revert "Fixed DPMS.setDeviceOwner() permission check."" into sc-v2-dev

1 files 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 f78d05e5c387..164cbacb4c35 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8418,20 +8418,18 @@ 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 (setProfileOwnerOnCurrentUserIfNecessary
                     && 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;
         }