commit 793fc4e5d2c40753e0e325d98b6c36ca76d02a7e
author Winson Chung <winsonc@google.com> Wed May 09 01:55:31 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 09 01:55:31 2012 -0700
tree 40c893d3283add4df105b512a49e00bbc73251d6
parent 5600b752a76662a3fe7bbe90003709fddc074ce5
parent 33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8

am 33a0ad56: Fixing NPE. (Bug 6460298)

* commit '33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8':
  Fixing NPE. (Bug 6460298)

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) {