From 079aaf1261f25769e664625869205a7e3841ed82 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Thu, 25 Aug 2022 13:41:24 +0800 Subject: [PATCH] Fix b/243746796 Crash when mouse hangs over an empty battery chart Bug: 243746796 Fix: 243746796 Test: manual Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde --- .../fuelgauge/batteryusage/BatteryChartView.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java index e668b37c24e..1a009eaa436 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java @@ -595,11 +595,13 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick // Searches the corresponding trapezoid index from x location. private int getTrapezoidIndex(float x) { - for (int index = 0; index < mTrapezoidSlots.length; index++) { - final TrapezoidSlot slot = mTrapezoidSlots[index]; - if (x >= slot.mLeft - mTrapezoidHOffset - && x <= slot.mRight + mTrapezoidHOffset) { - return index; + if (mTrapezoidSlots != null) { + for (int index = 0; index < mTrapezoidSlots.length; index++) { + final TrapezoidSlot slot = mTrapezoidSlots[index]; + if (x >= slot.mLeft - mTrapezoidHOffset + && x <= slot.mRight + mTrapezoidHOffset) { + return index; + } } } return BatteryChartViewModel.SELECTED_INDEX_INVALID;