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

Commit 62b9ff49 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev 

* changes:
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
parents 1ce5c28b abded113

core/java/android/os/BatteryStats.java

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ public abstract class BatteryStats implements Parcelable { 
            /**

             * The statistics associated with a particular service.

             */

            public abstract class Serv {

            public static abstract class Serv {



                /**

                 * Returns the amount of time spent started.

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

+615 −472

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+745 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
package com.android.internal.os;



import org.junit.runner.RunWith;

import org.junit.runners.Suite;



@RunWith(Suite.class)

@Suite.SuiteClasses({

        BatteryStatsServTest.class,

        BatteryStatsTimeBaseTest.class,

        BatteryStatsTimerTest.class,

        BatteryStatsUidTest.class,

    })

public class BatteryStatsTests {

}

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

0 → 100644
+339 −0

File added.

Preview size limit exceeded, changes collapsed.