Merge "Do not set profile owner on guest users on headless system user." into sc-v2-dev

This commit is contained in:
TreeHugger Robot
2021-10-07 17:15:23 +00:00
committed by Android (Google) Code Review

View File

@@ -10685,7 +10685,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
}
if (!mOwners.hasDeviceOwner() || !user.isFull() || user.isManagedProfile()) return;
if (!mOwners.hasDeviceOwner() || !user.isFull() || user.isManagedProfile()
|| user.isGuest()) {
return;
}
if (mInjector.userManagerIsHeadlessSystemUserMode()) {
ComponentName admin = mOwners.getDeviceOwnerComponent();