Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a211563b authored by Michael Wachenschwanz's avatar Michael Wachenschwanz
Browse files

Add an overload of startBatteryDetail for BatteryUtils mock 

Allow passing BatteryUtils to startBatteryDetailPage for testing
purposes.

Test: RunSettingsRoboTests
Bug: 38313557
Change-Id: Ie96bb69d50ab057e6d791e45a5eb320caec676b9
parent a203093d

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+11 −4
Original line number Diff line number Diff line
@@ -113,16 +113,16 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
    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(
@@ -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<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);