commit c1701ad4b2f7e8edf03438df26e1c2161d034847
author Patrick Dubroy <dubroy@google.com> Fri Jul 16 15:43:04 2010 -0700
committer Patrick Dubroy <dubroy@google.com> Fri Jul 16 15:43:04 2010 -0700
tree 750be5e00f15e28cb1358ad139a2c29839d831e4
parent 379f16080fc37b02e048afa0cc54c605ba0ad37e

Fix null pointer when dragging outside of workspace.

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index f2fad9a..0130ba9 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -394,13 +394,14 @@
             // Drop on someone?
             final int[] coordinates = mCoordinatesTemp;
             DropTarget dropTarget = findDropTarget(screenX, screenY, coordinates);
-            DropTarget delegate = dropTarget.getDropTargetDelegate(
-                    mDragSource, coordinates[0], coordinates[1],
-                    (int) mTouchOffsetX, (int) mTouchOffsetY, mDragView, mDragInfo);
-            if (delegate != null) {
-                dropTarget = delegate;
-            }
             if (dropTarget != null) {
+                DropTarget delegate = dropTarget.getDropTargetDelegate(
+                        mDragSource, coordinates[0], coordinates[1],
+                        (int) mTouchOffsetX, (int) mTouchOffsetY, mDragView, mDragInfo);
+                if (delegate != null) {
+                    dropTarget = delegate;
+                }
+
                 if (mLastDropTarget == dropTarget) {
                     dropTarget.onDragOver(mDragSource, coordinates[0], coordinates[1],
                         (int) mTouchOffsetX, (int) mTouchOffsetY, mDragView, mDragInfo);