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

Commit a30c9121 authored by Joe Onorato's avatar Joe Onorato Committed by android-build-merger
Browse files

Make getBatteryUptimeLocked protected so it can be mocked. am: e1acd636 

am: bfbbf28e

* commit 'bfbbf28e':
  Make getBatteryUptimeLocked protected so it can be mocked.
parents 1d995056 bfbbf28e

core/java/com/android/internal/os/BatteryStatsImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -9446,7 +9446,7 @@ public class BatteryStatsImpl extends BatteryStats { 
        return mDailyPackageChanges;

    }



    long getBatteryUptimeLocked() {

    protected long getBatteryUptimeLocked() {

        return mOnBatteryTimeBase.getUptime(mClocks.uptimeMillis() * 1000);

    }

core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public class BatteryStatsServTest extends TestCase { 
     * Test startLaunchedLocked while not previously launched

     */

    @SmallTest

    public void testStartLaunchedLockedWhileNotLaunched() throws Exception  {

    public void testStartLaunchedLockedWhileLaunched() throws Exception  {

        MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {

            @Override

            public long getBatteryUptimeLocked() {
@@ -288,7 +288,7 @@ public class BatteryStatsServTest extends TestCase { 
     * Test startLaunchedLocked while previously launched

     */

    @SmallTest

    public void testStartLaunchedLockedWhileLaunched() throws Exception  {

    public void testStartLaunchedLockedWhileNotLaunched() throws Exception  {

        MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {

            @Override

            public long getBatteryUptimeLocked() {