From 9e2bda0c8750a7597f0421ff48601e73f01c8780 Mon Sep 17 00:00:00 2001
From: Yiling Chuang <emilychuang@google.com>
Date: Tue, 6 Aug 2024 10:56:07 +0000
Subject: [PATCH] Fix the charging string while charging wirelessly

Move the null check of the charging remaining time after the wireless charging check, so when the time to full is not available, there's still a chance to show the customized wireless charging state.

Fixes: 342046505
Test: atest SettingsRoboTests
Flag: EXEMPT bugfix
Change-Id: I8a6104c46222e9f27d488035a218856f51e30430
---
 .../fuelgauge/BatteryHeaderPreferenceController.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index f121d0c2e5b..891a9977e8f 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -92,8 +92,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
                 && mBatterySettingsFeatureProvider.isChargingOptimizationMode(mContext)) {
             return info.remainingLabel;
         }
-        if (info.remainingLabel == null
-                || info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
+        if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
             return info.statusLabel;
         }
         if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
@@ -106,6 +105,9 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
                 return wirelessChargingLabel;
             }
         }
+        if (info.remainingLabel == null) {
+            return info.statusLabel;
+        }
         if (info.statusLabel != null && !info.discharging) {
             // Charging state
             if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {