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

This commit is contained in:
Tracy Zhou
2020-07-17 19:11:51 +00:00
committed by Android (Google) Code Review

View File

@@ -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,