diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-12-11 14:47:23 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:22 -0700 |
| commit | 8ca776ecd499f99e618e3f9227e4ea0600fe7b4f (patch) | |
| tree | 373a95f27792657bac84793e58ccdf77ab119113 /src | |
| parent | 59a4fa6a7fdc25ffd87de7392119a0089d14155b (diff) | |
| download | android_packages_apps_Trebuchet-8ca776ecd499f99e618e3f9227e4ea0600fe7b4f.tar.gz android_packages_apps_Trebuchet-8ca776ecd499f99e618e3f9227e4ea0600fe7b4f.tar.bz2 android_packages_apps_Trebuchet-8ca776ecd499f99e618e3f9227e4ea0600fe7b4f.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 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; |