Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8674a5df authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I70de7e0d5e63af01fde704cc604014723ea6a448
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33b1853f 2c50b9f7

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -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