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

Merge change I8dfd6ea8 into eclair

Browse Source 
* changes:
  Handle bad lines in /proc/wakelocks : Fix for 2124260
This commit is contained in:
Android (Google) Code Review
2009-09-30 14:49:21 -04:00
parent 1537a25520 53b707ba26
commit 86aece8b4a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -867,15 +867,15 @@ public final class BatteryStatsImpl extends BatteryStats {
String[] nameStringArray = mProcWakelocksName;
long[] wlData = mProcWakelocksData;
Process.parseProcLine(wlBuffer, startIndex, endIndex, PROC_WAKELOCKS_FORMAT,
nameStringArray, wlData, null);
boolean parsed = Process.parseProcLine(wlBuffer, startIndex, endIndex,
PROC_WAKELOCKS_FORMAT, nameStringArray, wlData, null);
name = nameStringArray[0];
count = (int) wlData[1];
// convert nanoseconds to microseconds with rounding.
totalTime = (wlData[2] + 500) / 1000;
if (name.length() > 0) {
if (parsed && name.length() > 0) {
if (!m.containsKey(name)) {
m.put(name, new KernelWakelockStats(count, totalTime,
sKernelWakelockUpdateVersion));
@@ -892,7 +892,7 @@ public final class BatteryStatsImpl extends BatteryStats {
numUpdatedWlNames++;
}
}
}
}
startIndex = endIndex;
}