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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-29 02:49:43 +00:00
committed by Android (Google) Code Review
parent 25273478c7 1b7f98457f
commit ae8b46904a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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