Merge "Fix flaky RuntimeException in CellLayout." into udc-qpr-dev am: 06ca4d9c6e am: 12c0933c6a

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

Change-Id: Ibfce519ee888b3652e76eac6ac1b60d75c92867b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Schneider Victor-tulias
2023-07-26 22:17:24 +00:00
committed by Automerger Merge Worker
+4 -2
View File
@@ -2735,11 +2735,13 @@ public class CellLayout extends ViewGroup {
}
public boolean isOccupied(int x, int y) {
if (x < mCountX && y < mCountY) {
if (x >= 0 && x < mCountX && y >= 0 && y < mCountY) {
return mOccupied.cells[x][y];
} else {
}
if (BuildConfig.IS_STUDIO_BUILD) {
throw new RuntimeException("Position exceeds the bound of this CellLayout");
}
return true;
}
@Override