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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15999410

Change-Id: I1072d4ef2ff398fc833a1e22c21e2e1e5687c73c
This commit is contained in:
TreeHugger Robot
2021-10-07 17:16:26 +00:00
committed by Automerger Merge Worker

View File

@@ -10686,7 +10686,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();