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

Commit 9faaf90b authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

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

Merge "Infinite loop when migrating calendar widget" into rvc-d1-dev am: 4527d2db am: f96e2b89 am: 2342af53

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

Change-Id: I7c590c4b84cc1852e7ba805c43d854160b2d57b0
parents aea3ec06 2342af53

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -406,7 +406,7 @@ public class GridSizeMigrationTaskV2 { 
         * to speed up the search.

         * to speed up the search.

         */

         */

        private boolean findPlacement(DbEntry entry) {

        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++) {

                for (int x = mNextStartX; x < mTrgX; x++) {

                    boolean fits = mOccupied.isRegionVacant(x, y, entry.spanX, entry.spanY);

                    boolean fits = mOccupied.isRegionVacant(x, y, entry.spanX, entry.spanY);

                    boolean minFits = mOccupied.isRegionVacant(x, y, entry.minSpanX,

                    boolean minFits = mOccupied.isRegionVacant(x, y, entry.minSpanX,