From 8ca776ecd499f99e618e3f9227e4ea0600fe7b4f Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Wed, 11 Dec 2013 14:47:23 -0800 Subject: Fix new NPE relating to reorder hints Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47 --- src/com/android/launcher3/CellLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index f46e77bfa..da38a03e3 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -2634,9 +2634,9 @@ public class CellLayout extends ViewGroup { } if (mode == MODE_SHOW_REORDER_HINT) { - beginOrAdjustReorderPreviewAnimations(finalSolution, dragView, 0, - ReorderPreviewAnimation.MODE_HINT); if (finalSolution != null) { + beginOrAdjustReorderPreviewAnimations(finalSolution, dragView, 0, + ReorderPreviewAnimation.MODE_HINT); result[0] = finalSolution.dragViewX; result[1] = finalSolution.dragViewY; resultSpan[0] = finalSolution.dragViewSpanX; -- cgit v1.2.3