summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-05-06 19:19:43 -0700
committerWinson Chung <winsonc@google.com>2012-05-06 19:20:59 -0700
commit579225f894b7d83bf14361aaaf843e1c621ee547 (patch)
treea98c6ee1a935f04788c329d5729bfb892801e6b6 /src
parent04cb48f465e7a9382efa9438ef9826ba5bcb416d (diff)
downloadandroid_packages_apps_Trebuchet-579225f894b7d83bf14361aaaf843e1c621ee547.tar.gz
android_packages_apps_Trebuchet-579225f894b7d83bf14361aaaf843e1c621ee547.tar.bz2
android_packages_apps_Trebuchet-579225f894b7d83bf14361aaaf843e1c621ee547.zip
Fixing NPE in DragController. (Bug 6449615)
Change-Id: I84982043f4a39b0676c3d620fcd6e3c642cc5897
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/DragController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index b9d7dd4f9..9b617552e 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -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;