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

Commit d4d190ca authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev 

* commit 'd4c1861a':
  BatteryStats: Fix units in wakelock distribution calculation
parents 9d513cec d4c1861a

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

+3 −3
Original line number Diff line number Diff line
@@ -8073,7 +8073,7 @@ public final class BatteryStatsImpl extends BatteryStats { 
                    timer.mUid.mSystemCpuTime.addCountLocked(systemTimeUs);



                    final Uid.Proc proc = timer.mUid.getProcessStatsLocked("*wakelock*");

                    proc.addCpuTimeLocked(userTimeUs, systemTimeUs);

                    proc.addCpuTimeLocked(userTimeUs / 1000, systemTimeUs / 1000);



                    mTempTotalCpuUserTimeUs -= userTimeUs;

                    mTempTotalCpuSystemTimeUs -= systemTimeUs;
@@ -8097,8 +8097,8 @@ public final class BatteryStatsImpl extends BatteryStats { 
                u.mSystemCpuTime.addCountLocked(mTempTotalCpuSystemTimeUs);



                final Uid.Proc proc = u.getProcessStatsLocked("*lost*");

                proc.addCpuTimeLocked((int) mTempTotalCpuUserTimeUs,

                        (int) mTempTotalCpuSystemTimeUs);

                proc.addCpuTimeLocked((int) mTempTotalCpuUserTimeUs / 1000,

                        (int) mTempTotalCpuSystemTimeUs / 1000);

            }

        }