commit 06ca4d9c6ed4d1a19f0ad30554d8c12f21d72403
author Schneider Victor-tulias <victortulias@google.com> Wed Jul 26 20:35:15 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 26 20:35:15 2023 +0000
tree 6e7bfda0590b3aacaaa8873594a336dc0f82ff26
parent 372f88dd2371b1b850ef89bf71fda3b90a27ecb7
parent 750c5af2da66f073dd3881664f63e97bc8702032

Merge "Fix flaky RuntimeException in CellLayout." into udc-qpr-dev

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 64ac841..4674401 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -2735,11 +2735,13 @@
     }
 
     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