Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev

This commit is contained in:
TreeHugger Robot
2022-08-26 05:36:37 +00:00
committed by Android (Google) Code Review

View File

@@ -595,6 +595,9 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
// Searches the corresponding trapezoid index from x location. // Searches the corresponding trapezoid index from x location.
private int getTrapezoidIndex(float x) { private int getTrapezoidIndex(float x) {
if (mTrapezoidSlots == null) {
return BatteryChartViewModel.SELECTED_INDEX_INVALID;
}
for (int index = 0; index < mTrapezoidSlots.length; index++) { for (int index = 0; index < mTrapezoidSlots.length; index++) {
final TrapezoidSlot slot = mTrapezoidSlots[index]; final TrapezoidSlot slot = mTrapezoidSlots[index];
if (x >= slot.mLeft - mTrapezoidHOffset if (x >= slot.mLeft - mTrapezoidHOffset