From add3f2c8a1ef68dd08f9775d244140ea57919c4b Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 8 May 2012 10:00:31 -0700
Subject: [PATCH] Fixing NPE. (Bug 6460298)

Change-Id: I535cdcabb9121594b4a877839e8a0ef1c6b25af1
---
 src/com/android/launcher2/ItemInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/android/launcher2/ItemInfo.java
index d34b87e399..dedc0f4f32 100644
--- a/src/com/android/launcher2/ItemInfo.java
+++ b/src/com/android/launcher2/ItemInfo.java
@@ -115,7 +115,7 @@ class ItemInfo {
     static String getPackageName(Intent intent) {
         if (intent != null) {
             String packageName = intent.getPackage();
-            if (packageName == null) {
+            if (packageName == null && intent.getComponent() != null) {
                 packageName = intent.getComponent().getPackageName();
             }
             if (packageName != null) {