Merge "Fixing NPE in DragController. (Bug 6449615)" into jb-dev

2012-05-06 19:32:48 -07:00
parent 30774acbb8 579225f894
commit 96b8a056f8
1 changed files with 2 additions and 2 deletions
@@ -381,8 +381,8 @@ public class DragController {
                    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;