Try and resolve the package name from the intent directly falling back to the resolved component name if it fails. (Bug 6452306)
Change-Id: Ifb2187fb845f807f30df966bf298ffde1b779b46
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 9b61755..b4b20c6 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 = info.intent.getComponent().getPackageName().equals(
- dragInfo.intent.getComponent().getPackageName());
+ boolean isSamePackage = dragInfo.getPackageName().equals(
+ info.getPackageName());
if (isSamePackage) {
cancelDrag();
return;