Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4527d2db authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

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

parents d5b15bb0 85f9efa7

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

+1 −1
Original line number Diff line number Diff line
@@ -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,