commit f96e2b89c39ccd9fb0a284f640897e116df663fc
author Tracy Zhou <tracyzhou@google.com> Fri Jul 17 19:41:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 19:41:49 2020 +0000
tree 79291f63d5d5532fa6fdecbbfc12ecaba7928a62
parent befa44ac886aeddc0bb01acf5607911902f69d88
parent 4527d2dbb248d9e2902989569e5b54a80e3d585f

Merge "Infinite loop when migrating calendar widget" into rvc-d1-dev am: 4527d2dbb2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12160682

Change-Id: I3a5dbdee535d44cc222977e21f1dd8e24233a19c

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,