am 60e1efe0: Fix NPE when dragging shortcut without component while app is uninstalled

* commit '60e1efe032821235c04376088494b44dfde4b62e':
  Fix NPE when dragging shortcut without component while app is uninstalled
This commit is contained in:
Adam Cohen
2014-06-17 10:48:48 +00:00
committed by Android Git Automerger
@@ -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;