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

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

am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power... 

am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev

* commit '0fdd22a6':
  BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime
parents a8522a65 0fdd22a6

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

+6 −1
Original line number Diff line number Diff line
@@ -77,7 +77,12 @@ public class KernelUidCpuTimeReader { 
                final int uid = Integer.parseInt(uidStr.substring(0, uidStr.length() - 1), 10);

                final long userTimeUs = Long.parseLong(splitter.next(), 10);

                final long systemTimeUs = Long.parseLong(splitter.next(), 10);

                final long powerMaUs = Long.parseLong(splitter.next(), 10) / 1000;

                final long powerMaUs;

                if (splitter.hasNext()) {

                    powerMaUs = Long.parseLong(splitter.next(), 10) / 1000;

                } else {

                    powerMaUs = 0;

                }



                if (callback != null) {

                    long userTimeDeltaUs = userTimeUs;