diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-09-04 23:13:39 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2013-09-04 23:13:39 -0400 |
| commit | b56e95af5d46510334e01b109c4ec34f46be4562 (patch) | |
| tree | 07e0fe05e61ffab4e5efdea1e80d607a04bdf15e /src | |
| parent | f96c9f889fe0222124cb2d33ecf508e3f745f902 (diff) | |
| download | android_packages_apps_Trebuchet-b56e95af5d46510334e01b109c4ec34f46be4562.tar.gz android_packages_apps_Trebuchet-b56e95af5d46510334e01b109c4ec34f46be4562.tar.bz2 android_packages_apps_Trebuchet-b56e95af5d46510334e01b109c4ec34f46be4562.zip | |
Fix crash on uninstall via drag.
Bug: 10347293
Change-Id: I2a2e4693fb79dd71a71cb53f9a90899788702a17
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 01a8adf77..9007b58b7 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3493,7 +3493,10 @@ public class Workspace extends SmoothPagedView if (success && !(beingCalledAfterUninstall && !mUninstallSuccessful)) { if (target != this && mDragInfo != null) { - getParentCellLayoutForView(mDragInfo.cell).removeView(mDragInfo.cell); + CellLayout parentCell = getParentCellLayoutForView(mDragInfo.cell); + if (parentCell != null) { + parentCell.removeView(mDragInfo.cell); + } if (mDragInfo.cell instanceof DropTarget) { mDragController.removeDropTarget((DropTarget) mDragInfo.cell); } |