diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-05-06 19:37:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-06 19:37:29 -0700 |
| commit | 369c0c7f6ed8bd5714897f4c30333a6266d6e735 (patch) | |
| tree | b8806e8266812119087f0bcf6528d50d7664f631 | |
| parent | 3f50b467e3aa9d9fdf5be540c3c620a1a3a41cfc (diff) | |
| parent | 96b8a056f81720e632d07e3467f1528e834f746e (diff) | |
| download | android_packages_apps_Trebuchet-369c0c7f6ed8bd5714897f4c30333a6266d6e735.tar.gz android_packages_apps_Trebuchet-369c0c7f6ed8bd5714897f4c30333a6266d6e735.tar.bz2 android_packages_apps_Trebuchet-369c0c7f6ed8bd5714897f4c30333a6266d6e735.zip | |
am 96b8a056: Merge "Fixing NPE in DragController. (Bug 6449615)" into jb-dev
* commit '96b8a056f81720e632d07e3467f1528e834f746e':
Fixing NPE in DragController. (Bug 6449615)
| -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; |