commit 8c46b20958a61d4f2ebddaab54d3a4c43b50f2f0
author Tracy Zhou <tracyzhou@google.com> Fri Jul 17 19:11:51 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 17 19:11:51 2020 +0000
tree 46c114fd178b1879a37ca50905d1f0104711ef0a
parent 2a22f3686d854ab3392850b1c6242c532eb2892f
parent b814c3bb2358183f3cb03c17926bb869f1a17841

Merge "Infinite loop when migrating calendar widget" into ub-launcher3-rvc-dev

src/com/android/launcher3/model/GridSizeMigrationTaskV2.java

diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
index ebdfa8c..79467d3 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
@@ -406,7 +406,7 @@
          * to speed up the search.
          */
         private boolean findPlacement(DbEntry entry) {
-            for (int y = mNextStartY; y > 0; y--) {
+            for (int y = mNextStartY; y >= (mScreenId == 0 ? 1 /* smartspace */ : 0); y--) {
                 for (int x = mNextStartX; x < mTrgX; x++) {
                     boolean fits = mOccupied.isRegionVacant(x, y, entry.spanX, entry.spanY);
                     boolean minFits = mOccupied.isRegionVacant(x, y, entry.minSpanX,