From 7bcadad93f97e79d95ae879fe165de2e2371f613 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 2 Apr 2012 07:23:44 -0700
Subject: [PATCH] Fix NPE

Bug: 6259450
Change-Id: Iea92f3832fcd3a88e7d13b2e55ba4faf83be93dd
---
 src/com/android/launcher2/DragController.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index eba89e5369..2a1d65adce 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -377,7 +377,11 @@ public class DragController {
             if (rawDragInfo instanceof ShortcutInfo) {
                 ShortcutInfo dragInfo = (ShortcutInfo) rawDragInfo;
                 for (ApplicationInfo info : apps) {
-                    if (dragInfo.intent.getComponent().equals(info.intent.getComponent())) {
+                    // Added null checks to prevent NPE we've seen in the wild
+                    if (dragInfo != null &&
+                        dragInfo.intent != null &&
+                        info.intent != null &&
+                        dragInfo.intent.getComponent().equals(info.intent.getComponent())) {
                         cancelDrag();
                         return;
                     }