commit add3f2c8a1ef68dd08f9775d244140ea57919c4b
author Winson Chung <winsonc@google.com> Tue May 08 10:00:31 2012 -0700
committer The Android Automerger <android-build@android.com> Tue May 08 15:54:07 2012 -0700
tree 86be2e4a3f50a93a4d8a3c05edbeb7e6409e53f0
parent a38d615580db2120a6af8104edb9f86b81eadf5d

Fixing NPE. (Bug 6460298)

Change-Id: I535cdcabb9121594b4a877839e8a0ef1c6b25af1

src/com/android/launcher2/ItemInfo.java

diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/android/launcher2/ItemInfo.java
index d34b87e..dedc0f4 100644
--- a/src/com/android/launcher2/ItemInfo.java
+++ b/src/com/android/launcher2/ItemInfo.java
@@ -115,7 +115,7 @@
     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) {