Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove some uses of deprecated BatteryStatsHelper"

Browse Source
This commit is contained in:
Dmitri Plotnikov
2022-02-08 18:13:11 +00:00
committed by Android (Google) Code Review
parent a6350c179b 1825a0f5b1
commit 5d1735108a
10 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/java/android/os/BatteryStats.java
View File

@@ -52,6 +52,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.internal.os.BatteryUsageStatsProvider;
import com.android.internal.os.PowerCalculator;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -4020,7 +4021,7 @@ public abstract class BatteryStats implements Parcelable {
sb.append(" ");
sb.append(controllerName);
sb.append(" Battery drain: ").append(
BatteryStatsHelper.makemAh(powerDrainMaMs / MILLISECONDS_IN_HOUR));
PowerCalculator.formatCharge(powerDrainMaMs / MILLISECONDS_IN_HOUR));
sb.append("mAh");
pw.println(sb.toString());
}
@@ -4402,10 +4403,10 @@ public abstract class BatteryStats implements Parcelable {
final List<BatterySipper> sippers = helper.getUsageList();
if (sippers != null && sippers.size() > 0) {
dumpLine(pw, 0 /* uid */, category, POWER_USE_SUMMARY_DATA,
BatteryStatsHelper.makemAh(helper.getPowerProfile().getBatteryCapacity()),
BatteryStatsHelper.makemAh(helper.getComputedPower()),
BatteryStatsHelper.makemAh(helper.getMinDrainedPower()),
BatteryStatsHelper.makemAh(helper.getMaxDrainedPower()));
PowerCalculator.formatCharge(helper.getPowerProfile().getBatteryCapacity()),
PowerCalculator.formatCharge(helper.getComputedPower()),
PowerCalculator.formatCharge(helper.getMinDrainedPower()),
PowerCalculator.formatCharge(helper.getMaxDrainedPower()));
int uid = 0;
for (int i=0; i<sippers.size(); i++) {
final BatterySipper bs = sippers.get(i);
@@ -4459,10 +4460,10 @@ public abstract class BatteryStats implements Parcelable {
label = "???";
}
dumpLine(pw, uid, category, POWER_USE_ITEM_DATA, label,
BatteryStatsHelper.makemAh(bs.totalPowerMah),
PowerCalculator.formatCharge(bs.totalPowerMah),
bs.shouldHide ? 1 : 0,
BatteryStatsHelper.makemAh(bs.screenPowerMah),
BatteryStatsHelper.makemAh(bs.proportionalSmearMah));
PowerCalculator.formatCharge(bs.screenPowerMah),
PowerCalculator.formatCharge(bs.proportionalSmearMah));
}
}
@@ -4896,11 +4897,11 @@ public abstract class BatteryStats implements Parcelable {
}
private void printmAh(PrintWriter printer, double power) {
printer.print(BatteryStatsHelper.makemAh(power));
printer.print(PowerCalculator.formatCharge(power));
}
private void printmAh(StringBuilder sb, double power) {
sb.append(BatteryStatsHelper.makemAh(power));
sb.append(PowerCalculator.formatCharge(power));
}
/**
@@ -4947,7 +4948,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Estimated battery capacity: ");
sb.append(BatteryStatsHelper.makemAh(estimatedBatteryCapacity));
sb.append(PowerCalculator.formatCharge(estimatedBatteryCapacity));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -4957,7 +4958,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Last learned battery capacity: ");
sb.append(BatteryStatsHelper.makemAh(lastLearnedBatteryCapacity / 1000));
sb.append(PowerCalculator.formatCharge(lastLearnedBatteryCapacity / 1000));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -4966,7 +4967,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Min learned battery capacity: ");
sb.append(BatteryStatsHelper.makemAh(minLearnedBatteryCapacity / 1000));
sb.append(PowerCalculator.formatCharge(minLearnedBatteryCapacity / 1000));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -4975,7 +4976,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Max learned battery capacity: ");
sb.append(BatteryStatsHelper.makemAh(maxLearnedBatteryCapacity / 1000));
sb.append(PowerCalculator.formatCharge(maxLearnedBatteryCapacity / 1000));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -5039,7 +5040,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Discharge: ");
sb.append(BatteryStatsHelper.makemAh(dischargeCount / 1000.0));
sb.append(PowerCalculator.formatCharge(dischargeCount / 1000.0));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -5049,7 +5050,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Screen off discharge: ");
sb.append(BatteryStatsHelper.makemAh(dischargeScreenOffCount / 1000.0));
sb.append(PowerCalculator.formatCharge(dischargeScreenOffCount / 1000.0));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -5059,7 +5060,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Screen doze discharge: ");
sb.append(BatteryStatsHelper.makemAh(dischargeScreenDozeCount / 1000.0));
sb.append(PowerCalculator.formatCharge(dischargeScreenDozeCount / 1000.0));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -5069,7 +5070,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Screen on discharge: ");
sb.append(BatteryStatsHelper.makemAh(dischargeScreenOnCount / 1000.0));
sb.append(PowerCalculator.formatCharge(dischargeScreenOnCount / 1000.0));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -5079,7 +5080,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Device light doze discharge: ");
sb.append(BatteryStatsHelper.makemAh(dischargeLightDozeCount / 1000.0));
sb.append(PowerCalculator.formatCharge(dischargeLightDozeCount / 1000.0));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -5089,7 +5090,7 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix);
sb.append(" Device deep doze discharge: ");
sb.append(BatteryStatsHelper.makemAh(dischargeDeepDozeCount / 1000.0));
sb.append(PowerCalculator.formatCharge(dischargeDeepDozeCount / 1000.0));
sb.append(" mAh");
pw.println(sb.toString());
}
@@ -5645,7 +5646,8 @@ public abstract class BatteryStats implements Parcelable {
sb.setLength(0);
sb.append(prefix); sb.append(" Uid ");
UserHandle.formatUid(sb, bs.uidObj.getUid());
sb.append(": "); sb.append(BatteryStatsHelper.makemAh(bs.mobilemspp));
sb.append(": ");
sb.append(PowerCalculator.formatCharge(bs.mobilemspp));
sb.append(" ("); sb.append(bs.mobileRxPackets+bs.mobileTxPackets);
sb.append(" packets over "); formatTimeMsNoSpace(sb, bs.mobileActive);
sb.append(") "); sb.append(bs.mobileActiveCount); sb.append("x");
@@ -5869,7 +5871,8 @@ public abstract class BatteryStats implements Parcelable {
packets = 1;
}
sb.append(" @ ");
sb.append(BatteryStatsHelper.makemAh(uidMobileActiveTime / 1000 / (double)packets));
sb.append(PowerCalculator.formatCharge(
uidMobileActiveTime / 1000 / (double) packets));
sb.append(" mspp");
pw.println(sb.toString());
}

6
core/java/com/android/internal/os/BatteryStatsHelper.java
View File

@@ -64,7 +64,7 @@ import java.util.List;
*/
@Deprecated
public class BatteryStatsHelper {
static final boolean DEBUG = false;
private static final boolean DEBUG = false;
private static final String TAG = BatteryStatsHelper.class.getSimpleName();
@@ -268,10 +268,6 @@ public class BatteryStatsHelper {
sBatteryBroadcastXfer = mBatteryBroadcast;
}
public static String makemAh(double power) {
return PowerCalculator.formatCharge(power);
}
/**
* Refreshes the power usage list.
*/

2
core/java/com/android/internal/os/BluetoothPowerCalculator.java
View File

@@ -32,7 +32,7 @@ import java.util.List;
public class BluetoothPowerCalculator extends PowerCalculator {
private static final String TAG = "BluetoothPowerCalc";
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
private static final boolean DEBUG = PowerCalculator.DEBUG;
private static final BatteryConsumer.Key[] UNINITIALIZED_KEYS = new BatteryConsumer.Key[0];

2
core/java/com/android/internal/os/CpuPowerCalculator.java
View File

@@ -30,7 +30,7 @@ import java.util.List;
public class CpuPowerCalculator extends PowerCalculator {
private static final String TAG = "CpuPowerCalculator";
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
private static final boolean DEBUG = PowerCalculator.DEBUG;
private static final BatteryConsumer.Key[] UNINITIALIZED_KEYS = new BatteryConsumer.Key[0];
private final int mNumCpuClusters;

2
core/java/com/android/internal/os/IdlePowerCalculator.java
View File

@@ -31,7 +31,7 @@ import java.util.List;
*/
public class IdlePowerCalculator extends PowerCalculator {
private static final String TAG = "IdlePowerCalculator";
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
private static final boolean DEBUG = PowerCalculator.DEBUG;
private final double mAveragePowerCpuSuspendMahPerUs;
private final double mAveragePowerCpuIdleMahPerUs;
public long mDurationMs;

2
core/java/com/android/internal/os/MobileRadioPowerCalculator.java
View File

@@ -29,7 +29,7 @@ import java.util.List;
public class MobileRadioPowerCalculator extends PowerCalculator {
private static final String TAG = "MobRadioPowerCalculator";
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
private static final boolean DEBUG = PowerCalculator.DEBUG;
private static final int NUM_SIGNAL_STRENGTH_LEVELS =
CellSignalStrength.getNumSignalStrengthLevels();

1
core/java/com/android/internal/os/PowerCalculator.java
View File

@@ -32,6 +32,7 @@ import java.util.Locale;
* Calculates power use of a device subsystem for an app.
*/
public abstract class PowerCalculator {
protected static final boolean DEBUG = false;
protected static final double MILLIAMPHOUR_PER_MICROCOULOMB = 1.0 / 1000.0 / 60.0 / 60.0;

2
core/java/com/android/internal/os/ScreenPowerCalculator.java
View File

@@ -39,7 +39,7 @@ import java.util.List;
*/
public class ScreenPowerCalculator extends PowerCalculator {
private static final String TAG = "ScreenPowerCalculator";
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
private static final boolean DEBUG = PowerCalculator.DEBUG;
// Minimum amount of time the screen should be on to start smearing drain to apps
public static final long MIN_ACTIVE_TIME_FOR_SMEARING = 10 * DateUtils.MINUTE_IN_MILLIS;

2
core/java/com/android/internal/os/WakelockPowerCalculator.java
View File

@@ -30,7 +30,7 @@ import java.util.List;
public class WakelockPowerCalculator extends PowerCalculator {
private static final String TAG = "WakelockPowerCalculator";
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
private static final boolean DEBUG = PowerCalculator.DEBUG;
private final UsageBasedPowerEstimator mPowerEstimator;
private static class PowerAndDuration {

2
core/java/com/android/internal/os/WifiPowerCalculator.java
View File

@@ -33,7 +33,7 @@ import java.util.List;
* from the WiFi controller.
*/
public class WifiPowerCalculator extends PowerCalculator {
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
private static final boolean DEBUG = PowerCalculator.DEBUG;
private static final String TAG = "WifiPowerCalculator";
private static final BatteryConsumer.Key[] UNINITIALIZED_KEYS = new BatteryConsumer.Key[0];