diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-12-11 14:47:23 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-12-11 14:47:47 -0800 |
| commit | fe69287b97d16c8941ab9463e4868fca45ad8152 (patch) | |
| tree | 6cac2073547a0d1cbc94f8f7d3724e17b9f9be75 /src | |
| parent | 52a935a242b79a97c30852babe7396a6f7e47aa2 (diff) | |
| download | android_packages_apps_Trebuchet-fe69287b97d16c8941ab9463e4868fca45ad8152.tar.gz android_packages_apps_Trebuchet-fe69287b97d16c8941ab9463e4868fca45ad8152.tar.bz2 android_packages_apps_Trebuchet-fe69287b97d16c8941ab9463e4868fca45ad8152.zip | |
Fix new NPE relating to reorder hints
Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index a05dd90c0..75f6a196c 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -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; |