commit 7be5f565e9b5a87c02db8c53e249fc4bf8dbbb02
author Adam Cohen <adamcohen@google.com> Thu Nov 14 11:59:31 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 14 11:59:31 2013 -0800
tree b47547424b50b9724723800c715bbb1a052a60a2
parent ed1ead7ab5e5eec2cdf244437fbc797e314918da
parent ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8

am ab087b9f: Fix NPE we\'re seeing in feedback (issue 11626428)

* commit 'ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8':
  Fix NPE we're seeing in feedback (issue 11626428)

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());