commit d039b6e2546311cb197e93c01b9b2a8752225f0e
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:38:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:38:40 2014 +0000
tree 312343c1cfe21fded352b8fac771991c3c37b05d
parent bf597a68e97265f7d3f5325f050f8bd844dd9266
parent fe69287b97d16c8941ab9463e4868fca45ad8152

am fe69287b: Fix new NPE relating to reorder hints

* commit 'fe69287b97d16c8941ab9463e4868fca45ad8152':
  Fix new NPE relating to reorder hints

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;