Fix b/243746796 Crash when mouse hangs over an empty battery chart

Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
This commit is contained in:
Zaiyue Xue
2022-08-25 13:41:24 +08:00
parent 0e5de165ca
commit 079aaf1261

View File

@@ -595,11 +595,13 @@ 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) {
for (int index = 0; index < mTrapezoidSlots.length; index++) { if (mTrapezoidSlots != null) {
final TrapezoidSlot slot = mTrapezoidSlots[index]; for (int index = 0; index < mTrapezoidSlots.length; index++) {
if (x >= slot.mLeft - mTrapezoidHOffset final TrapezoidSlot slot = mTrapezoidSlots[index];
&& x <= slot.mRight + mTrapezoidHOffset) { if (x >= slot.mLeft - mTrapezoidHOffset
return index; && x <= slot.mRight + mTrapezoidHOffset) {
return index;
}
} }
} }
return BatteryChartViewModel.SELECTED_INDEX_INVALID; return BatteryChartViewModel.SELECTED_INDEX_INVALID;