From ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 11 Nov 2013 15:37:21 +0000
Subject: [PATCH] Fix NPE we're seeing in feedback (issue 11626428)

Change-Id: I848ca84b325339004ba8ea50a01f5240eea356f5
---
 src/com/android/launcher3/DragController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index 5e733f08b..ab4823343 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -327,7 +327,7 @@ public class DragController {
                 for (AppInfo info : appInfos) {
                     // Added null checks to prevent NPE we've seen in the wild
                     if (dragInfo != null &&
-                        dragInfo.intent != null) {
+                            dragInfo.intent != null && info != null) {
                         ComponentName cn = dragInfo.intent.getComponent();
                         boolean isSameComponent = cn.equals(info.componentName) ||
                                 packageNames.contains(cn.getPackageName());
-- 
2.11.0