am fdf33a8b: am 4b990549: am 8b0b1504: Use the appropriate default icon

* commit 'fdf33a8b803683887240b7d4ef6e614bc77ddc79':
  Use the appropriate default icon

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()));

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(

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);
     }
     

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();
     }