diff options
Diffstat (limited to 'core/java/android')
4 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index f18507e..18ba8c4 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1624,7 +1624,7 @@ final class ApplicationPackageManager extends PackageManager { } Drawable dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo); if (dr == null) { - dr = getDefaultActivityIcon(); + dr = itemInfo.loadDefaultIcon(this); } return getUserManager().getBadgedDrawableForUser(dr, new UserHandle(mContext.getUserId())); diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 482ad6e..548a0c9 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -839,7 +839,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** * @hide */ - @Override protected Drawable loadDefaultIcon(PackageManager pm) { + @Override + public Drawable loadDefaultIcon(PackageManager pm) { if ((flags & FLAG_EXTERNAL_STORAGE) != 0 && isPackageUnavailable(pm)) { return Resources.getSystem().getDrawable( diff --git a/core/java/android/content/pm/ComponentInfo.java b/core/java/android/content/pm/ComponentInfo.java index 7e8f285..cc06b67 100644 --- a/core/java/android/content/pm/ComponentInfo.java +++ b/core/java/android/content/pm/ComponentInfo.java @@ -179,7 +179,8 @@ public class ComponentInfo extends PackageItemInfo { /** * @hide */ - @Override protected Drawable loadDefaultIcon(PackageManager pm) { + @Override + public Drawable loadDefaultIcon(PackageManager pm) { return applicationInfo.loadIcon(pm); } diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index 4b5bdda..cacdf8e 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -187,7 +187,7 @@ public class PackageItemInfo { * * @hide */ - protected Drawable loadDefaultIcon(PackageManager pm) { + public Drawable loadDefaultIcon(PackageManager pm) { return pm.getDefaultActivityIcon(); } |