From db811dbc704fd8170e66951e992e83098aecf158 Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Fri, 29 Aug 2014 13:43:59 +0100
Subject: [PATCH] Fix NPE from empty PackageInfo

Bug: 17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
---
 core/java/android/app/ApplicationPackageManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 68438276ddac..e2def3158eaa 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -1640,7 +1640,10 @@ final class ApplicationPackageManager extends PackageManager {
         if (itemInfo.showUserIcon != UserHandle.USER_NULL) {
             return new BitmapDrawable(getUserManager().getUserIcon(itemInfo.showUserIcon));
         }
-        Drawable dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo);
+        Drawable dr = null;
+        if (itemInfo.packageName != null) {
+            dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo);
+        }
         if (dr == null) {
             dr = itemInfo.loadDefaultIcon(this);
         }
-- 
2.11.0