From ffd77c645393fe77da264139690b5bdac547640e Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Wed, 27 Jul 2022 17:46:38 +0000 Subject: [PATCH] Remove duplicate dump method. Switch to TimeUtils.dumpTime since it does the exact same thing as the one in TareUtils, which allows us to remove an object that was only used for log dumps. Bug: 239951405 Test: adb shell dumpsys tare Change-Id: I4327fab589b79c77a5987505e64371d8b8368254 --- .../service/java/com/android/server/tare/Ledger.java | 2 +- .../java/com/android/server/tare/TareUtils.java | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java b/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java index 2e2a9b56d3dfa..f412dd69f4e29 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java @@ -17,9 +17,9 @@ package com.android.server.tare; import static android.text.format.DateUtils.HOUR_IN_MILLIS; +import static android.util.TimeUtils.dumpTime; import static com.android.server.tare.TareUtils.cakeToString; -import static com.android.server.tare.TareUtils.dumpTime; import static com.android.server.tare.TareUtils.getCurrentTimeMillis; import android.annotation.NonNull; diff --git a/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java b/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java index 6b6984f6ac172..aa4c75a0be801 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java @@ -19,26 +19,15 @@ package com.android.server.tare; import static android.app.tare.EconomyManager.CAKE_IN_ARC; import android.annotation.NonNull; -import android.annotation.SuppressLint; -import android.util.IndentingPrintWriter; import com.android.internal.annotations.VisibleForTesting; -import java.text.SimpleDateFormat; import java.time.Clock; class TareUtils { - @SuppressLint("SimpleDateFormat") - private static final SimpleDateFormat sDumpDateFormat = - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - @VisibleForTesting static Clock sSystemClock = Clock.systemUTC(); - static void dumpTime(IndentingPrintWriter pw, long time) { - pw.print(sDumpDateFormat.format(time)); - } - static long getCurrentTimeMillis() { return sSystemClock.millis(); }