Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '0fdd22a60241cc0c5e96f5783bf8c798fe7f8f8d':
  BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime
This commit is contained in:
Adam Lesinski
2015-07-02 00:37:40 +00:00
committed by Android Git Automerger
parent a8522a65a7 0fdd22a602
commit 499ddbaa79
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/os/KernelUidCpuTimeReader.java
View File

@@ -77,7 +77,12 @@ public class KernelUidCpuTimeReader {
final int uid = Integer.parseInt(uidStr.substring(0, uidStr.length() - 1), 10); final int uid = Integer.parseInt(uidStr.substring(0, uidStr.length() - 1), 10);
final long userTimeUs = Long.parseLong(splitter.next(), 10); final long userTimeUs = Long.parseLong(splitter.next(), 10);
final long systemTimeUs = 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) { if (callback != null) {
long userTimeDeltaUs = userTimeUs; long userTimeDeltaUs = userTimeUs;