commit 9c74327e13b18a550dda6feec3f7651ed80edaa9
author Sebastian Franco <fransebas@google.com> Tue Nov 15 15:03:25 2022 -0800
committer Sebastian Franco <fransebas@google.com> Tue Nov 15 15:13:23 2022 -0800
tree d02c9a4bdbcdfda25de2f0647bdd4573382b5fd1
parent f9a6ac241a6d2725823b2661a7342acd1d9874ca

Fixing the revert by not continuing the reorder if the solution is null.

Fix: 258023561
Bug: 259234533
Test: atest testAddDeleteShortcutOnHotseat
Change-Id: I63a2abf8a80e16fb45f4bbb3b2de413ef77b5e0c

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index e500e59..691184a 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -2559,8 +2559,8 @@
             result[1] = finalSolution.cellY;
             resultSpan[0] = finalSolution.spanX;
             resultSpan[1] = finalSolution.spanY;
+            performReorder(finalSolution, dragView, mode);
         }
-        performReorder(finalSolution, dragView, mode);
         return result;
     }