diff options
| author | 2023-03-16 19:15:30 +0000 | |
|---|---|---|
| committer | 2023-03-16 19:15:30 +0000 | |
| commit | 2c50b9f7e27df31357cacbcf294f9fee8c72dfaa (patch) | |
| tree | 9e1f819d33dcb020cddfc6709f5f7cc4e448dc40 | |
| parent | 068037300492e31ef5c3a3dfa1755214343b0b7f (diff) | |
| parent | ab80737e25acf3bd4514e75db6f4d44f4b110ace (diff) | |
Merge "Send financed device state changed broadcast to POs on user 0" into udc-dev
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 720533f6a389..321924c79c58 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -21882,7 +21882,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } if (!isProfileOwnerOfOrganizationOwnedDevice( admin.info.getComponent(), user.getIdentifier()) - && !isDeviceOwner(admin)) { + && !isDeviceOwner(admin) + && !(isProfileOwner(admin.info.getComponent(), user.getIdentifier()) + && admin.getUserHandle().isSystem())) { continue; } // Don't send the broadcast twice if the DPC is the same package as the |