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

am 77fa24a5: Merge change 26136 into eclair

Browse Source 
Merge commit '77fa24a5ef3ee3bc108d4bf3c77b7b4c7d0d5451' into eclair-plus-aosp

* commit '77fa24a5ef3ee3bc108d4bf3c77b7b4c7d0d5451':
  Fix NPE crash-loop when cpufreq not available in the kernel.
This commit is contained in:
Brad Fitzpatrick
2009-09-21 04:46:07 -07:00
committed by Android Git Automerger
parent 6971f0be53 77fa24a5ef
commit 73d7ca9d56
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/ProcessStats.java
View File

@@ -509,6 +509,8 @@ public class ProcessStats {
} }
int speed = 0; int speed = 0;
String file = readFile("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state", '\0'); String file = readFile("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state", '\0');
// Note: file may be null on kernels without cpufreq (i.e. the emulator's)
if (file != null) {
StringTokenizer st = new StringTokenizer(file, "\n "); StringTokenizer st = new StringTokenizer(file, "\n ");
while (st.hasMoreElements()) { while (st.hasMoreElements()) {
String token = st.nextToken(); String token = st.nextToken();
@@ -528,6 +530,7 @@ public class ProcessStats {
Log.i(TAG, "Unable to parse time_in_state"); Log.i(TAG, "Unable to parse time_in_state");
} }
} }
}
if (out == null) { if (out == null) {
out = new long[speed]; out = new long[speed];
mCpuSpeeds = new long[speed]; mCpuSpeeds = new long[speed];