diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-05-06 19:32:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-06 19:32:48 -0700 |
| commit | 96b8a056f81720e632d07e3467f1528e834f746e (patch) | |
| tree | 1efccc2834d42dd607640fd291ba67964e487628 /src | |
| parent | 30774acbb8b8711e3eef48ac9baaec99788d16a0 (diff) | |
| parent | 579225f894b7d83bf14361aaaf843e1c621ee547 (diff) | |
| download | android_packages_apps_Trebuchet-96b8a056f81720e632d07e3467f1528e834f746e.tar.gz android_packages_apps_Trebuchet-96b8a056f81720e632d07e3467f1528e834f746e.tar.bz2 android_packages_apps_Trebuchet-96b8a056f81720e632d07e3467f1528e834f746e.zip | |
Merge "Fixing NPE in DragController. (Bug 6449615)" into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 4 |
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; |