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

Merge "Change the master code the same as tm-qpr-dev to avoid future merge conflicts."

Browse Source
This commit is contained in:
YK Hung
2022-08-26 16:07:40 +00:00
committed by Android (Google) Code Review
parent 4b3a489ad3 4bb92296b5
commit 65b0c83dad
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
View File

@@ -595,7 +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) {
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
@@ -603,7 +605,6 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
return index;
}
}
}
return BatteryChartViewModel.SELECTED_INDEX_INVALID;
}