Merge "Avoid unnecessary badging" into qt-dev

2019-05-02 16:59:19 +00:00
parent 9829cf5451 e34a75dfd0
commit 501152f974
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -2764,6 +2764,9 @@ public class ApplicationPackageManager extends PackageManager {
        if (itemInfo.packageName != null) {
            dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo);
        }
+        if (dr == null && itemInfo != appInfo) {
+            dr = loadUnbadgedItemIcon(appInfo, appInfo);
+        }
        if (dr == null) {
            dr = itemInfo.loadDefaultIcon(this);
        }