commit ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8
author Adam Cohen <adamcohen@google.com> Mon Nov 11 15:37:21 2013 +0000
committer Adam Cohen <adamcohen@google.com> Mon Nov 11 15:46:07 2013 +0000
tree dd098f2921e9779d49b17153aee848954aad3d65
parent 2777273a2a5c710f26726ada0fe4a8f33da57b52

Fix NPE we're seeing in feedback (issue 11626428)

Change-Id: I848ca84b325339004ba8ea50a01f5240eea356f5

src/com/android/launcher3/DragController.java

diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index 5e733f0..ab48233 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -327,7 +327,7 @@
                 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());