commit 4002465f5824b7f1b8bdf9927c71b2585ad2bdde
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:37:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:37:46 2014 +0000
tree 5110821d613cda5f3e17fe52d62b947bcd63b4ce
parent 51cc53160db29cdd2a69968a292961c9e2ed2204
parent 7be5f565e9b5a87c02db8c53e249fc4bf8dbbb02

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

* commit '7be5f565e9b5a87c02db8c53e249fc4bf8dbbb02':
  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());