Merge "Send financed device state changed broadcast to POs on user 0" into udc-dev

2023-03-16 19:15:30 +00:00
parent 0680373004 ab80737e25
commit 2c50b9f7e2
1 changed files with 3 additions and 1 deletions
--- 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