| commit | 2342af53f8dbf01e0d16127dcf276e1407e02238 | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Fri Jul 17 20:02:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 20:02:18 2020 +0000 |
| tree | 79291f63d5d5532fa6fdecbbfc12ecaba7928a62 | |
| parent | a4939fcb899cacfa6c742a19a12c2352159e972a [diff] | |
| parent | f96e2b89c39ccd9fb0a284f640897e116df663fc [diff] |
Merge "Infinite loop when migrating calendar widget" into rvc-d1-dev am: 4527d2dbb2 am: f96e2b89c3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12160682 Change-Id: Idc6835ac2575df9451d38c423251a5df3c562435
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,