diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-06-17 10:48:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 10:48:48 +0000 |
| commit | d2f374ff52d4e57507ddf4625093df634258df06 (patch) | |
| tree | 691f2057c90f143e565b0469763cc0fb8227d6e5 | |
| parent | 21b35c52037b6441df22821eb97903811a5e7986 (diff) | |
| parent | 60e1efe032821235c04376088494b44dfde4b62e (diff) | |
| download | android_packages_apps_Trebuchet-d2f374ff52d4e57507ddf4625093df634258df06.tar.gz android_packages_apps_Trebuchet-d2f374ff52d4e57507ddf4625093df634258df06.tar.bz2 android_packages_apps_Trebuchet-d2f374ff52d4e57507ddf4625093df634258df06.zip | |
am 60e1efe0: Fix NPE when dragging shortcut without component while app is uninstalled
* commit '60e1efe032821235c04376088494b44dfde4b62e':
Fix NPE when dragging shortcut without component while app is uninstalled
| -rw-r--r-- | src/com/android/launcher3/DragController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java index 4c3ea2a0a..6d0a2be63 100644 --- a/src/com/android/launcher3/DragController.java +++ b/src/com/android/launcher3/DragController.java @@ -329,8 +329,8 @@ public class DragController { if (dragInfo != null && dragInfo.intent != null && info != null) { ComponentName cn = dragInfo.intent.getComponent(); - boolean isSameComponent = cn.equals(info.componentName) || - packageNames.contains(cn.getPackageName()); + boolean isSameComponent = cn != null && (cn.equals(info.componentName) || + packageNames.contains(cn.getPackageName())); if (isSameComponent) { cancelDrag(); return; |