commit 579225f894b7d83bf14361aaaf843e1c621ee547
author Winson Chung <winsonc@google.com> Sun May 06 19:19:43 2012 -0700
committer Winson Chung <winsonc@google.com> Sun May 06 19:20:59 2012 -0700
tree a98c6ee1a935f04788c329d5729bfb892801e6b6
parent 04cb48f465e7a9382efa9438ef9826ba5bcb416d

Fixing NPE in DragController. (Bug 6449615)

Change-Id: I84982043f4a39b0676c3d620fcd6e3c642cc5897

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index b9d7dd4..9b61755 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -381,8 +381,8 @@
                     if (dragInfo != null &&
                         dragInfo.intent != null &&
                         info.intent != null) {
-                        boolean isSamePackage = dragInfo.intent.getPackage().equals(
-                                info.intent.getPackage());
+                        boolean isSamePackage = info.intent.getComponent().getPackageName().equals(
+                                dragInfo.intent.getComponent().getPackageName());
                         if (isSamePackage) {
                             cancelDrag();
                             return;