diff options
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
-rw-r--r-- | src/com/android/launcher2/DragController.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index c9bebe3c5..4be4e8f7b 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -380,10 +380,13 @@ public class DragController { // Added null checks to prevent NPE we've seen in the wild if (dragInfo != null && dragInfo.intent != null && - info.intent != null && - dragInfo.intent.getComponent().equals(info.intent.getComponent())) { - cancelDrag(); - return; + info.intent != null) { + boolean isSamePackage = dragInfo.intent.getPackage().equals( + info.intent.getPackage()); + if (isSamePackage) { + cancelDrag(); + return; + } } } } |