PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add an overload of startBatteryDetail for BatteryUtils mock

Browse Source 
Allow passing BatteryUtils to startBatteryDetailPage for testing
purposes.

Test: RunSettingsRoboTests
Bug: 38313557
Change-Id: Ie96bb69d50ab057e6d791e45a5eb320caec676b9
This commit is contained in:
Michael Wachenschwanz
2017-07-13 16:00:30 -07:00
parent a203093d75
commit a211563bfb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -113,16 +113,16 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
private List<Anomaly> mAnomalies; private List<Anomaly> mAnomalies;
private String mPackageName; private String mPackageName;
public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment, @VisibleForTesting
BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent, static void startBatteryDetailPage(SettingsActivity caller, BatteryUtils batteryUtils,
List<Anomaly> anomalies) { PreferenceFragment fragment, BatteryStatsHelper helper, int which, BatteryEntry entry,
String usagePercent, List<Anomaly> anomalies) {
// Initialize mStats if necessary. // Initialize mStats if necessary.
helper.getStats(); helper.getStats();
final Bundle args = new Bundle(); final Bundle args = new Bundle();
final BatterySipper sipper = entry.sipper; final BatterySipper sipper = entry.sipper;
final BatteryStats.Uid uid = sipper.uidObj; final BatteryStats.Uid uid = sipper.uidObj;
final BatteryUtils batteryUtils = BatteryUtils.getInstance(caller);
final boolean isTypeApp = sipper.drainType == BatterySipper.DrainType.APP; final boolean isTypeApp = sipper.drainType == BatterySipper.DrainType.APP;
final long foregroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs( final long foregroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs(
@@ -152,6 +152,13 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
new UserHandle(UserHandle.getUserId(sipper.getUid()))); 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, public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
String packageName) { String packageName) {
final Bundle args = new Bundle(2); final Bundle args = new Bundle(2);