From fb3ebf8dc70e58b639cef297c687b7ce52dbdbec 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 Merged-In: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde --- .../settings/fuelgauge/batteryusage/BatteryChartView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java index e668b37c24e..cfdd851a644 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java @@ -595,6 +595,9 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick // Searches the corresponding trapezoid index from x location. private int getTrapezoidIndex(float x) { + if (mTrapezoidSlots == null) { + return BatteryChartViewModel.SELECTED_INDEX_INVALID; + } for (int index = 0; index < mTrapezoidSlots.length; index++) { final TrapezoidSlot slot = mTrapezoidSlots[index]; if (x >= slot.mLeft - mTrapezoidHOffset