Merge "Ensure taskbar hotseat array index is in bounds" into sc-dev

2021-03-10 21:28:59 +00:00
parent 73cc9a5053 bc08503e0b
commit b9672a668d
1 changed files with 4 additions and 1 deletions
@@ -78,7 +78,10 @@ public class TaskbarHotseatController {
                CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
                // Since the hotseat might be laid out vertically or horizontally, use whichever
                // index is higher.
-                hotseatItemInfos[Math.max(lp.cellX, lp.cellY)] = itemInfo;
+                int index = Math.max(lp.cellX, lp.cellY);
+                if (0 <= index && index < hotseatItemInfos.length) {
+                    hotseatItemInfos[index] = itemInfo;
+                }
            }
        }