commit fe69287b97d16c8941ab9463e4868fca45ad8152
author Adam Cohen <adamcohen@google.com> Wed Dec 11 14:47:23 2013 -0800
committer Adam Cohen <adamcohen@google.com> Wed Dec 11 14:47:47 2013 -0800
tree 6cac2073547a0d1cbc94f8f7d3724e17b9f9be75
parent 52a935a242b79a97c30852babe7396a6f7e47aa2

Fix new NPE relating to reorder hints

Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index a05dd90..75f6a19 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -2632,9 +2632,9 @@
         }
 
         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;