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

Commit 68fbeda8 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Don't show corp badge for supervised users"

parents 89a797ab 730970d8

packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java

+6 −3
Original line number Diff line number Diff line
@@ -175,9 +175,12 @@ public class UserIconDrawable extends Drawable implements Drawable.Callback { 
    public UserIconDrawable setBadgeIfManagedUser(Context context, int userId) {

        Drawable badge = null;

        if (userId != UserHandle.USER_NULL) {

            boolean isManaged = context.getSystemService(DevicePolicyManager.class)

                    .getProfileOwnerAsUser(userId) != null;

            if (isManaged) {

            DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);

            boolean isCorp =

                    dpm.getProfileOwnerAsUser(userId) != null // has an owner

                    && dpm.getProfileOwnerOrDeviceOwnerSupervisionComponent(UserHandle.of(userId))

                            == null; // and has no supervisor

            if (isCorp) {

                badge = getDrawableForDisplayDensity(

                        context, com.android.internal.R.drawable.ic_corp_badge_case);

            }