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

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

Change-Id: I7c590c4b84cc1852e7ba805c43d854160b2d57b0
This commit is contained in:
Tracy Zhou
2020-07-17 20:19:23 +00:00
committed by Automerger Merge Worker
@@ -406,7 +406,7 @@ public class GridSizeMigrationTaskV2 {
* 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,