Don't crash if default supervision profile owner is not set am: b5fa0a6c5e

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

Change-Id: I8a1c43b4f43cee5c88f05eafed4b71a5b1144445
This commit is contained in:
Tomasz Wasilczyk
2021-12-14 20:07:05 +00:00
committed by Automerger Merge Worker

View File

@@ -9381,6 +9381,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final ComponentName doComponent = mOwners.getDeviceOwnerComponent();
final ComponentName poComponent =
mOwners.getProfileOwnerComponent(userHandle.getIdentifier());
if (supervisorComponent == null) {
return null;
}
if (supervisorComponent.equals(doComponent) || supervisorComponent.equals(
poComponent)) {
return supervisorComponent;