commit 8e5d7061fa4c9b8a5d8b54aafdb7e23f6c440e97
author Michael Jurka <mikejurka@google.com> Mon May 14 19:41:22 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 14 19:41:22 2012 -0700
tree b4e819a5e883eb7809da750f75d6f91ff8ea8f9e
parent f048c6ec3cb5d54ababe2cce396740332f478fc6
parent 9ad005639e1698c94674cdfadf3ae342fb56c9b5

am 9ad00563: Fix issue where Google Voice shortcuts would disappear

* commit '9ad005639e1698c94674cdfadf3ae342fb56c9b5':
  Fix issue where Google Voice shortcuts would disappear

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index bc88a98..fc1a26d 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -1089,7 +1089,9 @@
 
                                 // App shortcuts that used to be automatically added to Launcher
                                 // didn't always have the correct intent flags set, so do that here
-                                if (intent.getAction().equals(Intent.ACTION_MAIN) &&
+                                if (intent.getAction() != null &&
+                                        intent.getCategories() != null &&
+                                        intent.getAction().equals(Intent.ACTION_MAIN) &&
                                         intent.getCategories().contains(Intent.CATEGORY_LAUNCHER)) {
                                     intent.addFlags(
                                         Intent.FLAG_ACTIVITY_NEW_TASK |