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

Commit 01db547d authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Add more granular precondition checks for debugging 

Test: TH
Flag: EXEMPT trivial change
Bug: 421803457
Change-Id: Iec54fce2c7eea073a747a96ea7d76ae5e642de71
parent 16bb6d31

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

+8 −4
Original line number Diff line number Diff line
@@ -10392,10 +10392,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    caller, who, userHandle, hasIncompatibleAccountsOrNonAdb);

            final ActiveAdmin admin = getActiveAdminUncheckedLocked(who, userHandle);

            Preconditions.checkArgument(

                    isPackageInstalledForUser(who.getPackageName(), userHandle)

                            && admin != null

                            && !getUserData(userHandle).mRemovingAdmins.contains(who),

                    "Not active admin: " + who);

                    isPackageInstalledForUser(who.getPackageName(), userHandle),

                    "Package %s not installed in user %d"

                            .formatted(who.getPackageName(), userHandle));

            Preconditions.checkArgument(admin != null, "Not active admin: " + who);

            Preconditions.checkArgument(

                    !getUserData(userHandle).mRemovingAdmins.contains(who),

                    "Admin %s is being removed from user %d"

                            .formatted(who, userHandle));















            final int parentUserId = getProfileParentId(userHandle);















            // When trying to set a profile owner on a new user, it may be that this user is