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

Commit 9b48407b authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge changes I60f4b688,I1d783b10 into main 

* changes:
  Add Power State and Screen State to BatteryUsageStats
  [Attempt 2] Add test for BatteryUsageStatsPerUid atom
parents c7077edb c2977948

core/java/android/os/AggregateBatteryConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public final class AggregateBatteryConsumer extends BatteryConsumer { 


    @Override

    public void dump(PrintWriter pw, boolean skipEmptyComponents) {

        mPowerComponents.dump(pw, skipEmptyComponents);

        mPowerComponents.dump(pw, SCREEN_STATE_ANY, POWER_STATE_ANY, skipEmptyComponents);

    }



    @Override

core/java/android/os/BatteryConsumer.java

+313 −132

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/BatteryUsageStats.java

+110 −30

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/BatteryUsageStatsQuery.java

+30 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/PowerComponents.java

+262 −142

File changed.

Preview size limit exceeded, changes collapsed.