Merge "Let launcher3 IconFactory add user badges." into qt-dev

1 files changed, 4 insertions, 9 deletions

diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 53c5cb1f..867d603c 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -59,7 +59,6 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Parcelable;
-import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.DeviceConfig;
@@ -720,14 +719,10 @@ public final class Utils {
     public static @NonNull Drawable getBadgedIcon(@NonNull Context context,
             @NonNull ApplicationInfo appInfo) {
         UserHandle user = UserHandle.getUserHandleForUid(appInfo.uid);
-        if (Process.myUserHandle().equals(user)) {
-            return appInfo.loadIcon(context.getPackageManager());
-        } else {
-            try (IconFactory iconFactory = IconFactory.obtain(context)) {
-                Bitmap iconBmp = iconFactory.createBadgedIconBitmap(
-                        appInfo.loadUnbadgedIcon(context.getPackageManager()), user, false).icon;
-                return new BitmapDrawable(context.getResources(), iconBmp);
-            }
+        try (IconFactory iconFactory = IconFactory.obtain(context)) {
+            Bitmap iconBmp = iconFactory.createBadgedIconBitmap(
+                    appInfo.loadUnbadgedIcon(context.getPackageManager()), user, false).icon;
+            return new BitmapDrawable(context.getResources(), iconBmp);
         }
     }