From bb21c0e1b74299c9c1bdec1b5fef008fc052fed6 Mon Sep 17 00:00:00 2001
From: Trina <trinachang@google.com>
Date: Mon, 11 Sep 2023 11:16:58 +0000
Subject: [PATCH] Centralise time to full in SettingsLib

Test: atest SystemUIGoogleTests

Bug: 275679195
Change-Id: Ie4ca699e73e4ec48f2b0b8d95e61d0bd103f5e37
---
 src/com/android/settings/fuelgauge/BatteryInfo.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 9a19e85ca03..50ce5798c57 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -44,7 +44,6 @@ import com.android.settingslib.utils.StringUtil;
 
 public class BatteryInfo {
     private static final String TAG = "BatteryInfo";
-    private static final String GLOBAL_TIME_TO_FULL_MILLIS = "time_to_full_millis";
 
     public CharSequence chargeLabel;
     public CharSequence remainingLabel;
@@ -152,7 +151,7 @@ public class BatteryInfo {
     static long getSettingsChargeTimeRemaining(final Context context) {
         return Settings.Global.getLong(
                 context.getContentResolver(),
-                GLOBAL_TIME_TO_FULL_MILLIS, -1);
+                com.android.settingslib.fuelgauge.BatteryUtils.GLOBAL_TIME_TO_FULL_MILLIS, -1);
     }
 
     public static void getBatteryInfo(final Context context, final Callback callback,
@@ -287,7 +286,7 @@ public class BatteryInfo {
         if (getSettingsChargeTimeRemaining(context) != chargeTimeMs) {
             Settings.Global.putLong(
                     context.getContentResolver(),
-                    GLOBAL_TIME_TO_FULL_MILLIS,
+                    com.android.settingslib.fuelgauge.BatteryUtils.GLOBAL_TIME_TO_FULL_MILLIS,
                     chargeTimeMs);
         }