Merge "Add an overload of startBatteryDetail for BatteryUtils mock"
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index eb5d75f..106f7fa 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -113,16 +113,16 @@
private List<Anomaly> mAnomalies;
private String mPackageName;
- public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
- BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent,
- List<Anomaly> anomalies) {
+ @VisibleForTesting
+ static void startBatteryDetailPage(SettingsActivity caller, BatteryUtils batteryUtils,
+ PreferenceFragment fragment, BatteryStatsHelper helper, int which, BatteryEntry entry,
+ String usagePercent, List<Anomaly> anomalies) {
// Initialize mStats if necessary.
helper.getStats();
final Bundle args = new Bundle();
final BatterySipper sipper = entry.sipper;
final BatteryStats.Uid uid = sipper.uidObj;
- final BatteryUtils batteryUtils = BatteryUtils.getInstance(caller);
final boolean isTypeApp = sipper.drainType == BatterySipper.DrainType.APP;
final long foregroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs(
@@ -153,6 +153,13 @@
}
public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
+ BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent,
+ List<Anomaly> anomalies) {
+ startBatteryDetailPage(caller, BatteryUtils.getInstance(caller), fragment, helper, which,
+ entry, usagePercent, anomalies);
+ }
+
+ public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
String packageName) {
final Bundle args = new Bundle(2);
args.putString(EXTRA_PACKAGE_NAME, packageName);