Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Bookatz
2021-11-17 03:47:58 +00:00
committed by Android (Google) Code Review
parent 89a797ab00 730970d8a0
commit 68fbeda8f2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
View File

@@ -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);
}