Fix NPE when dragging shortcut without component while app is uninstalled

issue 14601562 Change-Id: Icf0472d38c1b02de8421f146e26f2e2d79de43dd
2014-06-13 19:11:57 -07:00
parent bc9efe7aae
commit 60e1efe032
1 changed files with 2 additions and 2 deletions
@@ -329,8 +329,8 @@ public class DragController {
                    if (dragInfo != null &&
                            dragInfo.intent != null && info != null) {
                        ComponentName cn = dragInfo.intent.getComponent();
-                        boolean isSameComponent = cn.equals(info.componentName) ||
-                                packageNames.contains(cn.getPackageName());
+                        boolean isSameComponent = cn != null && (cn.equals(info.componentName) ||
+                                packageNames.contains(cn.getPackageName()));
                        if (isSameComponent) {
                            cancelDrag();
                            return;