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

Commit 1498e865 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change the type of "hours" from long to double" into oc-dr1-dev

parents 05872fc1 8213f102

src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java

+4 −3
Original line number Diff line number Diff line
@@ -70,11 +70,12 @@ public class WakeupAlarmAnomalyDetector implements AnomalyDetector { 
            String targetPackageName) {

        final List<BatterySipper> batterySippers = batteryStatsHelper.getUsageList();

        final List<Anomaly> anomalies = new ArrayList<>();

        final long totalRunningHours = mBatteryUtils.calculateRunningTimeBasedOnStatsType(

                batteryStatsHelper, BatteryStats.STATS_SINCE_CHARGED) / DateUtils.HOUR_IN_MILLIS;

        final double totalRunningHours = mBatteryUtils.calculateRunningTimeBasedOnStatsType(

                batteryStatsHelper, BatteryStats.STATS_SINCE_CHARGED)

                / (double) DateUtils.HOUR_IN_MILLIS;

        final int targetUid = mBatteryUtils.getPackageUid(targetPackageName);



        if (totalRunningHours != 0) {

        if (totalRunningHours >= 1) {

            for (int i = 0, size = batterySippers.size(); i < size; i++) {

                final BatterySipper sipper = batterySippers.get(i);

                final BatteryStats.Uid uid = sipper.uidObj;

tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java

+3 −2
Original line number Diff line number Diff line
@@ -59,9 +59,10 @@ public class WakeupAlarmAnomalyDetectorTest { 
    private static final int ANOMALY_UID = 111;

    private static final int NORMAL_UID = 222;

    private static final int TARGET_UID = 333;

    private static final long RUNNING_TIME_MS = 2 * DateUtils.HOUR_IN_MILLIS;

    private static final long RUNNING_TIME_MS =

            1 * DateUtils.HOUR_IN_MILLIS + 10 * DateUtils.MINUTE_IN_MILLIS;

    private static final int ANOMALY_WAKEUP_COUNT = 500;

    private static final int NORMAL_WAKEUP_COUNT = 50;

    private static final int NORMAL_WAKEUP_COUNT = 61;

    @Mock

    private BatteryStatsHelper mBatteryStatsHelper;

    @Mock