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

* commit '4002465f5824b7f1b8bdf9927c71b2585ad2bdde': Fix NPE we're seeing in feedback (issue 11626428)
2014-02-14 20:53:39 +00:00
parent 42fafc28f4 4002465f58
commit fffd424068
1 changed files with 1 additions and 1 deletions
@@ -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());