commit 60e1efe032821235c04376088494b44dfde4b62e
author Adam Cohen <adamcohen@google.com> Fri Jun 13 19:11:57 2014 -0700
committer Adam Cohen <adamcohen@google.com> Fri Jun 13 19:16:33 2014 -0700
tree f1170748db3a8f9612fcf8089de2cc2c94f27bdc
parent bc9efe7aaee70c7128684c6b92163788e6d7de96

Fix NPE when dragging shortcut without component while app is uninstalled

issue 14601562

Change-Id: Icf0472d38c1b02de8421f146e26f2e2d79de43dd

src/com/android/launcher3/DragController.java

diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index 4c3ea2a..6d0a2be 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -329,8 +329,8 @@
                     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;