commit d23865708c4ca6d1d48eb8b1a3cb52d571e96f86
author Michael Jurka <mikejurka@google.com> Mon Jun 18 14:43:06 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 18 14:43:06 2012 -0700
tree 9cf1ca0385138d0a8d6af3c7dba8363f3cce77d4
parent 11ef746c5b20dc5be271435e8d2807a8bc22738e
parent 2561ee8453dc41a9d65f7890ea227416d7e8948c

am 2561ee84: am d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-dev

* commit '2561ee8453dc41a9d65f7890ea227416d7e8948c':
  Add null pointer checks to fix NPEs

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index dfbe8d2..53c3046 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -923,7 +923,9 @@
 
     private void onCloseComplete() {
         DragLayer parent = (DragLayer) getParent();
-        parent.removeView(this);
+        if (parent != null) {
+            parent.removeView(this);
+        }
         mDragController.removeDropTarget((DropTarget) this);
         clearFocus();
         mFolderIcon.requestFocus();

src/com/android/launcher2/InstallShortcutReceiver.java

diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java
index fb7bf30..20a1966 100644
--- a/src/com/android/launcher2/InstallShortcutReceiver.java
+++ b/src/com/android/launcher2/InstallShortcutReceiver.java
@@ -168,6 +168,7 @@
                 if (intent.getAction() == null) {
                     intent.setAction(Intent.ACTION_VIEW);
                 } else if (intent.getAction().equals(Intent.ACTION_MAIN) &&
+                        intent.getCategories() != null &&
                         intent.getCategories().contains(Intent.CATEGORY_LAUNCHER)) {
                     intent.addFlags(
                         Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);