Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2357a69 authored Jul 31, 2014 by Alexandra Gherghina Committed by Android Git Automerger Jul 31, 2014

am 8b0b1504: Use the appropriate default icon

* commit '8b0b1504a357ec809eed25c00923e67b4d6dad22':
  Use the appropriate default icon

parents 6d8917cc a7093145

core/java/android/app/ApplicationPackageManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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()));

core/java/android/content/pm/ApplicationInfo.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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(

core/java/android/content/pm/ComponentInfo.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

core/java/android/content/pm/PackageItemInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class PackageItemInfo {
		*
		* @hide
		*/
		protected Drawable loadDefaultIcon(PackageManager pm) {
		public Drawable loadDefaultIcon(PackageManager pm) {
		return pm.getDefaultActivityIcon();
		}