commit cb0468facb5a2a3927701b329f5f7e3309bb8fc3
author Adam Cohen <adamcohen@google.com> Fri Nov 15 08:50:13 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 15 08:50:13 2013 -0800
tree 4fea6d4a3c6e8e6cb044f55c350f11f994bc1bc2
parent 6641570ec10c95cfbaef139310c150626e035032
parent b79a48c251947d4bceb289953485f2aef6e55852

am b79a48c2: Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf

* commit 'b79a48c251947d4bceb289953485f2aef6e55852':
  Add logging for NPE (issue 11627249)

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f36c815..6c346c4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2536,6 +2536,13 @@
             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);