commit 725a8368851455a4758802bfa4fc1d11d4ded912
author Tracy Zhou <tracyzhou@google.com> Fri Jul 17 19:41:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 19:41:41 2020 +0000
tree e48006df62b1d08b214eec3f0b6310ea02f711f2
parent 42aec5174da7f5b92b66a4dcd1c3e8a903446398
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: I4ccf891b19df1ad5d5f4921b8fe4bac1bc6a6fca

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,