commit d3b0ce0df0855fbb8bb27bd48e92b0b33c1ba875
author Patrick Dubroy <dubroy@google.com> Sun Jan 16 10:42:13 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Jan 16 10:42:13 2011 -0800
tree 9d966797e63965840ead3e967d3103e3dd5f68a6
parent 63809b86cc98dc9365ad85a33f9d3dc1e4d3b1a9
parent f4b3e343f5d64e3fdbb83a8b7b13e974ca83b117

am f4b3e343: am 1619ccfc: Merge "Fix 3300849: Illegal state exception during dragging." into honeycomb

* commit 'f4b3e343f5d64e3fdbb83a8b7b13e974ca83b117':
  Fix 3300849: Illegal state exception during dragging.

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 8e0308c..3f3088f 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1622,10 +1622,8 @@
         }
 
         mDragInfo = cellInfo;
-        mDragInfo.screen = mCurrentPage;
 
-        CellLayout current = getCurrentDropLayout();
-
+        CellLayout current = (CellLayout) getChildAt(cellInfo.screen);
         current.onDragChild(child);
 
         child.clearFocus();