am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints

* commit 'd039b6e2546311cb197e93c01b9b2a8752225f0e':
  Fix new NPE relating to reorder hints
This commit is contained in:
Adam Cohen
2014-02-14 20:54:35 +00:00
committed by Android Git Automerger
+2 -2
View File
@@ -2632,9 +2632,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;