commit d94533d04a5f8f5485f106d10af60169857ea899
author Romain Guy <romainguy@android.com> Mon Aug 17 10:01:15 2009 -0700
committer Joe Onorato <joeo@android.com> Mon Sep 21 15:12:31 2009 -0400
tree 8bc90f0747ed48ab83d718ef88ec5b0827411252
parent eb486df0976ba2921251087cd35d7ef41433d3fe

Fix possible NPE in Launcher.

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 2f09403..b8d44a1 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -602,13 +602,15 @@
      * @param targetXY Destination area to move to
      */
     void onDropChild(View child, int[] targetXY) {
-        LayoutParams lp = (LayoutParams) child.getLayoutParams();
-        lp.cellX = targetXY[0];
-        lp.cellY = targetXY[1];
-        lp.isDragging = false;
-        mDragRect.setEmpty();
-        child.requestLayout();
-        invalidate();
+        if (child != null) {
+            LayoutParams lp = (LayoutParams) child.getLayoutParams();
+            lp.cellX = targetXY[0];
+            lp.cellY = targetXY[1];
+            lp.isDragging = false;
+            mDragRect.setEmpty();
+            child.requestLayout();
+            invalidate();
+        }
     }
 
     void onDropAborted(View child) {