| commit | 835b25d1ddae65dbfbdfe90917566f2fcc08baf0 | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Fri Jul 17 19:43:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 19:43:00 2020 +0000 |
| tree | 2875287d57479663d4bd2c89a9ac2d063658b503 | |
| parent | 98a997e71a539807af90983b2a9ca961477d016f [diff] | |
| parent | 011fa1bac17651a8c078a29443c0965f0a274a42 [diff] |
Merge "Infinite loop when migrating calendar widget" into ub-launcher3-rvc-dev am: 8c46b20958 am: 011fa1bac1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12151323 Change-Id: I39bfa2410d80dba0879887c76f747ea8aa693d56
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,