From a211563bfb6aed1f7bf2d020a1a562c174bf447e Mon Sep 17 00:00:00 2001 From: Michael Wachenschwanz Date: Thu, 13 Jul 2017 16:00:30 -0700 Subject: [PATCH] Add an overload of startBatteryDetail for BatteryUtils mock Allow passing BatteryUtils to startBatteryDetailPage for testing purposes. Test: RunSettingsRoboTests Bug: 38313557 Change-Id: Ie96bb69d50ab057e6d791e45a5eb320caec676b9 --- .../fuelgauge/AdvancedPowerUsageDetail.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index eb5d75fa9b1..106f7fada11 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -113,16 +113,16 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements private List mAnomalies; private String mPackageName; - public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment, - BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent, - List anomalies) { + @VisibleForTesting + static void startBatteryDetailPage(SettingsActivity caller, BatteryUtils batteryUtils, + PreferenceFragment fragment, BatteryStatsHelper helper, int which, BatteryEntry entry, + String usagePercent, List 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( @@ -152,6 +152,13 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements new UserHandle(UserHandle.getUserId(sipper.getUid()))); } + public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment, + BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent, + List 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);