Revert change to non-profile user badged icon

ag/9507174 moved the profile badging logic, but accidently also touched
the non-profile badging logic. This cl just reverts that line back to
how it was originally.

Note that, in DevicePolicyManager terminology, the managed user is
called a 'profile', but in UserManager terminology, it is not. In this
commit message, I am using the word 'profile' in the UserManager sense.

Test: Manually confirmed with TestDPC that a managed non-profile user
has a badge
Fixes: 144831236

Change-Id: Icd4f215d49f317a0df8065d3c48c68eee0fd5b2c

1 files changed, 2 insertions, 3 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java b/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
index 69487d508443..274696bfec0e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
@@ -39,7 +39,6 @@ import android.graphics.Shader;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
-import android.os.UserManager;
 
 import com.android.settingslib.R;
 
@@ -177,8 +176,8 @@ public class UserIconDrawable extends Drawable implements Drawable.Callback {
             boolean isManaged = context.getSystemService(DevicePolicyManager.class)
                     .getProfileOwnerAsUser(userId) != null;
             if (isManaged) {
-                badge = getDrawableForDisplayDensity(context,
-                        context.getSystemService(UserManager.class).getUserBadgeResId(userId));
+                badge = getDrawableForDisplayDensity(
+                        context, com.android.internal.R.drawable.ic_corp_badge_case);
             }
         }
         return setBadge(badge);