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

am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev

Browse Source 
* commit 'e54253bdd317cbe806225081ad9ebe64f2b50b9a':
  Fix crash when no power_profile is specified
This commit is contained in:
Adam Lesinski
2015-09-18 22:21:31 +00:00
committed by Android Git Automerger
parent 13c23df90c e54253bdd3
commit dd0238ec7d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/os/KernelCpuSpeedReader.java
View File

@@ -58,7 +58,7 @@ public class KernelCpuSpeedReader {
TextUtils.SimpleStringSplitter splitter = new TextUtils.SimpleStringSplitter(' ');
String line;
int speedIndex = 0;
while ((line = reader.readLine()) != null) {
while (speedIndex < mLastSpeedTimes.length && (line = reader.readLine()) != null) {
splitter.setString(line);
Long.parseLong(splitter.next());

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

@@ -137,7 +137,7 @@ public class KernelUidCpuTimeReader {
mLastPowerMaUs.put(uid, powerMaUs);
}
} catch (IOException e) {
Slog.e(TAG, "Failed to read uid_cputime", e);
Slog.e(TAG, "Failed to read uid_cputime: " + e.getMessage());
}
mLastTimeReadUs = nowUs;
}