PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-25 16:19:14 +00:00
committed by Android (Google) Code Review
parent 2802ec1c44 079aaf1261
commit fb2090e643
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
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;