diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-13 11:46:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-13 11:46:27 +0000 |
| commit | b79a48c251947d4bceb289953485f2aef6e55852 (patch) | |
| tree | 0b1c380d0ae5b2840fbb6088ac8605f370568ce7 /src/com | |
| parent | 17e1aeac4bcc15a53eb0e2139d8690aa788a4320 (diff) | |
| parent | 2f32ad29075bf666199cc49fe20014e00991d1bb (diff) | |
| download | android_packages_apps_Trebuchet-b79a48c251947d4bceb289953485f2aef6e55852.tar.gz android_packages_apps_Trebuchet-b79a48c251947d4bceb289953485f2aef6e55852.tar.bz2 android_packages_apps_Trebuchet-b79a48c251947d4bceb289953485f2aef6e55852.zip | |
Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index f36c815da..6c346c4b7 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2536,6 +2536,13 @@ public class Workspace extends SmoothPagedView icon.clearPressedOrFocusedBackground(); } + if (child.getTag() == null || !(child.getTag() instanceof ItemInfo)) { + String msg = "Drag started with a view that has no tag set. This " + + "will cause a crash (issue 11627249) down the line. " + + "View: " + child + " tag: " + child.getTag(); + throw new IllegalStateException(msg); + } + mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale); |