commit f5a01823b12927b351b94a3c55943dbe5c2d0e0d
author YK Hung <ykhung@google.com> Tue Sep 12 06:15:04 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 12 06:15:04 2023 +0000
tree fd36e2f94c313eef933977e6f3ca052232921602
parent d84c60f2ace5daf6da27f6cc28dc6436c0171cbf
parent bb21c0e1b74299c9c1bdec1b5fef008fc052fed6

Merge "Centralise time to full in SettingsLib" into main

src/com/android/settings/fuelgauge/BatteryInfo.java

diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 9a19e85..50ce579 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -44,7 +44,6 @@
 
 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 @@
     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 @@
         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);
         }