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

Commit c2bcce24 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Revert "Disable multiuser toggle on COPE device and add explanat..."" into main

parents 0ac73820 dc85914a
Loading
Loading
Loading
Loading
+0 −26
Original line number Diff line number Diff line
@@ -293,32 +293,6 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils {
        return null;
    }

    /**
     * Checks whether add user is disabled on the device
     *
     * @param context {@link Context} for the calling user.
     *
     *
     * @param userId User to check enforced admin status for.
     *
     * @return EnforcedAdmin Object containing the enforced admin component and admin user details,
     * or {@code null} If adding user is not disabled.
     */
    public static EnforcedAdmin checkIfAddUserDisallowed(Context context, int userId) {
        final UserManager um = UserManager.get(context);
        if (!um.hasUserRestriction(UserManager.DISALLOW_ADD_USER, UserHandle.of(userId))) {
            // Restriction is not enforced.
            return null;
        }
        EnforcedAdmin enforcedAdmin = checkIfRestrictionEnforced(context,
                UserManager.DISALLOW_ADD_USER, userId);
        if (enforcedAdmin != null) {
            return enforcedAdmin;
        }
        return EnforcedAdmin.createDefaultEnforcedAdminWithRestriction(
                UserManager.DISALLOW_ADD_USER);
    }

    /**
     * Check if an application is suspended.
     *