From a5c37aced7c92a1ebfc2cd30f84392e14fb82754 Mon Sep 17 00:00:00 2001 From: Luofan Chen Date: Sun, 16 Feb 2025 05:11:57 +0000 Subject: [PATCH] health: Rename msToUTCString to msToHMSString Change-Id: I1d8a28eee49056e73917c052180fd7328eb7fbd5 --- .../org/lineageos/platform/internal/health/Util.java | 10 +++++----- .../platform/internal/health/ccprovider/Toggle.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/health/Util.java b/lineage/lib/main/java/org/lineageos/platform/internal/health/Util.java index 38b84ce2..14864674 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/health/Util.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/health/Util.java @@ -35,13 +35,13 @@ public class Util { } /** - * Convert seconds of the day to a string in the format "hh:mm:ss". - * in UTC. + * Convert milliseconds to a string in the format "HH:mm:ss". * - * @param ms milliseconds from epoch - * @return formatted time string in UTC time zone + * @param ms time in milliseconds, should be less than + * ${@link android.text.format.DateUtils#DAY_IN_MILLIS} + * @return formatted time string in the format "HH:mm:ss" */ - static public String msToUTCString(long ms) { + static public String msToHMSString(long ms) { final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); Calendar calendar = Calendar.getInstance(); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/health/ccprovider/Toggle.java b/lineage/lib/main/java/org/lineageos/platform/internal/health/ccprovider/Toggle.java index 1f537fee..bc3cd519 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/health/ccprovider/Toggle.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/health/ccprovider/Toggle.java @@ -10,7 +10,7 @@ import static lineageos.health.HealthInterface.MODE_LIMIT; import static lineageos.health.HealthInterface.MODE_MANUAL; import static org.lineageos.platform.internal.health.Util.msToString; -import static org.lineageos.platform.internal.health.Util.msToUTCString; +import static org.lineageos.platform.internal.health.Util.msToHMSString; import android.content.Context; import android.content.Intent; @@ -143,10 +143,10 @@ public class Toggle extends ChargingControlProvider { BatteryStatsManager.class)).getBatteryUsageStats(); long remaining = batteryUsageStats.getChargeTimeRemainingMs(); remaining += mChargingTimeMargin; - Log.i(TAG, "Current estimated time to full: " + msToUTCString(remaining)); + Log.i(TAG, "Current estimated time to full: " + msToHMSString(remaining)); long deltaTime = targetTime - currentTime; - Log.i(TAG, "Current time to target: " + msToUTCString(deltaTime)); + Log.i(TAG, "Current time to target: " + msToHMSString(deltaTime)); switch (stage) { case STAGE_NONE, STAGE_INITIAL -> { @@ -244,7 +244,7 @@ public class Toggle extends ChargingControlProvider { pw.println("Provider: " + getClass().getName()); pw.println(" mIsLimitSet: " + mIsLimitSet); pw.println(" mSavedTargetTime: " + msToString(mContext, mSavedTargetTime)); - pw.println(" mEstimatedFullTime: " + msToUTCString(mEstimatedFullTime)); + pw.println(" mEstimatedFullTime: " + msToHMSString(mEstimatedFullTime)); pw.println(" mStage: " + mStage); pw.println(" mChargeLimitMargin: " + mChargingLimitMargin); }