diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-06-13 19:11:57 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-06-13 19:16:33 -0700 |
| commit | 60e1efe032821235c04376088494b44dfde4b62e (patch) | |
| tree | f1170748db3a8f9612fcf8089de2cc2c94f27bdc /src/com | |
| parent | bc9efe7aaee70c7128684c6b92163788e6d7de96 (diff) | |
| download | android_packages_apps_Trebuchet-60e1efe032821235c04376088494b44dfde4b62e.tar.gz android_packages_apps_Trebuchet-60e1efe032821235c04376088494b44dfde4b62e.tar.bz2 android_packages_apps_Trebuchet-60e1efe032821235c04376088494b44dfde4b62e.zip | |
Fix NPE when dragging shortcut without component while app is uninstalled
issue 14601562
Change-Id: Icf0472d38c1b02de8421f146e26f2e2d79de43dd
Diffstat (limited to 'src/com')
| -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; |