From cf1206edf1e4a09e37765b7f09eac61820af1f61 Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Fri, 10 Jun 2022 15:05:36 -0700 Subject: [PATCH] Remove dependency of BatteryUsageStats on com.android.internal.os.PowerCalculator Bug: 235635119 Test: atest FrameworksCoreTests:BatteryStatsTests Change-Id: I93dd7a0489bb106d6a81e812d30058bb6cedf819 --- core/java/android/os/BatteryUsageStats.java | 9 ++++----- core/java/android/os/UidBatteryConsumer.java | 4 +--- core/java/android/os/UserBatteryConsumer.java | 4 +--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/core/java/android/os/BatteryUsageStats.java b/core/java/android/os/BatteryUsageStats.java index 58f93364f6867..b76592d4be587 100644 --- a/core/java/android/os/BatteryUsageStats.java +++ b/core/java/android/os/BatteryUsageStats.java @@ -28,7 +28,6 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.os.BatteryStatsHistory; import com.android.internal.os.BatteryStatsHistoryIterator; -import com.android.internal.os.PowerCalculator; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -539,15 +538,15 @@ public final class BatteryUsageStats implements Parcelable, Closeable { pw.println(" Estimated power use (mAh):"); pw.print(prefix); pw.print(" Capacity: "); - PowerCalculator.printPowerMah(pw, getBatteryCapacity()); + pw.print(BatteryStats.formatCharge(getBatteryCapacity())); pw.print(", Computed drain: "); - PowerCalculator.printPowerMah(pw, getConsumedPower()); + pw.print(BatteryStats.formatCharge(getConsumedPower())); final Range dischargedPowerRange = getDischargedPowerRange(); pw.print(", actual drain: "); - PowerCalculator.printPowerMah(pw, dischargedPowerRange.getLower()); + pw.print(BatteryStats.formatCharge(dischargedPowerRange.getLower())); if (!dischargedPowerRange.getLower().equals(dischargedPowerRange.getUpper())) { pw.print("-"); - PowerCalculator.printPowerMah(pw, dischargedPowerRange.getUpper()); + pw.print(BatteryStats.formatCharge(dischargedPowerRange.getUpper())); } pw.println(); diff --git a/core/java/android/os/UidBatteryConsumer.java b/core/java/android/os/UidBatteryConsumer.java index 91d231eb1c398..d2d6bec11b28b 100644 --- a/core/java/android/os/UidBatteryConsumer.java +++ b/core/java/android/os/UidBatteryConsumer.java @@ -23,8 +23,6 @@ import android.text.TextUtils; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; -import com.android.internal.os.PowerCalculator; - import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -109,7 +107,7 @@ public final class UidBatteryConsumer extends BatteryConsumer { pw.print("UID "); UserHandle.formatUid(pw, getUid()); pw.print(": "); - PowerCalculator.printPowerMah(pw, getConsumedPower()); + pw.print(BatteryStats.formatCharge(getConsumedPower())); if (mData.layout.processStateDataIncluded) { StringBuilder sb = new StringBuilder(); diff --git a/core/java/android/os/UserBatteryConsumer.java b/core/java/android/os/UserBatteryConsumer.java index c2d20a6c771f6..e1ec5cd66385f 100644 --- a/core/java/android/os/UserBatteryConsumer.java +++ b/core/java/android/os/UserBatteryConsumer.java @@ -20,8 +20,6 @@ import android.annotation.NonNull; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; -import com.android.internal.os.PowerCalculator; - import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -60,7 +58,7 @@ public class UserBatteryConsumer extends BatteryConsumer { pw.print("User "); pw.print(getUserId()); pw.print(": "); - PowerCalculator.printPowerMah(pw, consumedPower); + pw.print(BatteryStats.formatCharge(consumedPower)); pw.print(" ( "); mPowerComponents.dump(pw, skipEmptyComponents /* skipTotalPowerComponent */); pw.print(" ) ");