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

Commit 985aa11e authored by jackqdyulei's avatar jackqdyulei Committed by android-build-merger
Browse files

Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 33c9b7a1 

am: 9d57855c

Change-Id: Ib387fc18e5352afddf698f0108fc78c71b66dc88
parents 77a58c7b 9d57855c

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -331,8 +331,8 @@ public class BatteryUtils { 
    long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {

    long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {

        final BatteryStats.Timer timer = uid.getForegroundActivityTimer();

        final BatteryStats.Timer timer = uid.getForegroundActivityTimer();

        if (timer != null) {

        if (timer != null) {

            return convertUsToMs(

            return convertUsToMs(timer.getTotalTimeLocked(convertMsToUs(rawRealtimeMs),

                    timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED));

                            BatteryStats.STATS_SINCE_CHARGED));

        }

        }





        return 0;

        return 0;

tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; 
import android.content.Context;

import android.content.Context;

import android.os.BatteryStats;

import android.os.BatteryStats;

import android.os.Process;

import android.os.Process;

import android.os.SystemClock;

import android.text.format.DateUtils;

import android.text.format.DateUtils;





import com.android.internal.os.BatterySipper;

import com.android.internal.os.BatterySipper;
@@ -369,11 +370,12 @@ public class BatteryUtilsTest { 




    @Test

    @Test

    public void testGetForegroundActivityTotalTimeMs_returnMilliseconds() {

    public void testGetForegroundActivityTotalTimeMs_returnMilliseconds() {

        final long rawRealtimeMs = SystemClock.elapsedRealtime();

        doReturn(mTimer).when(mUid).getForegroundActivityTimer();

        doReturn(mTimer).when(mUid).getForegroundActivityTimer();

        doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer).getTotalTimeLocked(anyLong(),

        doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer)

                anyInt());

                .getTotalTimeLocked(rawRealtimeMs * 1000, BatteryStats.STATS_SINCE_CHARGED);





        assertThat(mBatteryUtils.getForegroundActivityTotalTimeMs(mUid, 0)).isEqualTo(

        assertThat(mBatteryUtils.getForegroundActivityTotalTimeMs(mUid, rawRealtimeMs)).isEqualTo(

                TIME_SINCE_LAST_FULL_CHARGE_MS);

                TIME_SINCE_LAST_FULL_CHARGE_MS);

    }

    }