diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-14 23:10:41 +0000 |
|---|---|---|
| committer | Anis Assi <anisassi@google.com> | 2022-01-04 21:08:03 +0000 |
| commit | 2080bfede2ed998a2a560b7b0a881ba6c68a905c (patch) | |
| tree | b92e8cc9c592374ea9d358479a4e77ebd3d1cb81 | |
| parent | 7699e13344aad0949102764c05295e39a7e23517 (diff) | |
| parent | dc06656820b1f3b188bf3115a1098280ecc293b8 (diff) | |
| download | base-2080bfede2ed998a2a560b7b0a881ba6c68a905c.tar.gz | |
Merge cherrypicks of [16460072] into security-aosp-rvc-release.android-security-11.0.0_r52
Change-Id: I8fa49223506e5c4a1559f2ea1204187d7be8ba7b
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 13ea6baf5a62..a7452e88d9bd 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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; |