| commit | 3d47be75ddd54a351533cae1fef87758b3d67827 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed Mar 10 21:33:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 10 21:33:15 2021 +0000 |
| tree | ddb79bb12c6109de8dc91860cb97aadd76bf348c | |
| parent | ca0ed4dc6e199546d975d6aece7c3ce4129185ab [diff] | |
| parent | b9672a668df885f4e043b1229b3080da9345d3bd [diff] |
Merge "Ensure taskbar hotseat array index is in bounds" into sc-dev am: b9672a668d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13817631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie30949b702924ec9058aa3a54ad70cecc55125a8
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java index 082343e..b1bafdb 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -78,7 +78,10 @@ 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; + } } }