From 4bb92296b5e20f4f2f2294453cf3407bd85ab884 Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Fri, 26 Aug 2022 13:36:36 +0800
Subject: [PATCH] Change the master code the same as tm-qpr-dev to avoid future
 merge conflicts.

Bug: 243746796
Test: manual
Change-Id: I9c693a65ebbbe33c9d132131f832c26505a23a4e
---
 .../fuelgauge/batteryusage/BatteryChartView.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
index 1a009eaa436..cfdd851a644 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
@@ -595,13 +595,14 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
 
     // Searches the corresponding trapezoid index from x location.
     private int getTrapezoidIndex(float x) {
-        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;
-                }
+        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
+                    && x <= slot.mRight + mTrapezoidHOffset) {
+                return index;
             }
         }
         return BatteryChartViewModel.SELECTED_INDEX_INVALID;