Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc08503e authored by Tony Wickham's avatar Tony Wickham
Browse files

Ensure taskbar hotseat array index is in bounds 

Test: switch from 5x5 grid to 4x4 grid, ensure no crash
Fixes: 181981906
Change-Id: Ic23e3d5f1debcfd2307e48c6aaac38d143fd95c3
parent 2b860d29

quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java

+4 −1
Original line number Diff line number Diff line
@@ -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;

                }

            }

        }