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

am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev

Browse Source 
* commit '6cd19e0266b3f4277f13dab7e9a86ebdd9905ee9':
  Fix some divide by zero errors that could crash the system.
This commit is contained in:
Dianne Hackborn
2012-06-06 14:17:54 -07:00
committed by Android Git Automerger
parent f2fb9044c5 6cd19e0266
commit 18aa041a62
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/os/ProcessStats.java
View File

@@ -619,8 +619,11 @@ public class ProcessStats {
}
final public float getTotalCpuPercent() {
return ((float)(mRelUserTime+mRelSystemTime+mRelIrqTime)*100)
/ (mRelUserTime+mRelSystemTime+mRelIrqTime+mRelIdleTime);
int denom = mRelUserTime+mRelSystemTime+mRelIrqTime+mRelIdleTime;
if (denom <= 0) {
return 0;
}
return ((float)(mRelUserTime+mRelSystemTime+mRelIrqTime)*100) / denom;
}
final void buildWorkingProcs() {
@@ -699,7 +702,7 @@ public class ProcessStats {
long sampleTime = mCurrentSampleTime - mLastSampleTime;
long sampleRealTime = mCurrentSampleRealTime - mLastSampleRealTime;
long percAwake = (sampleTime*100) / sampleRealTime;
long percAwake = sampleRealTime > 0 ? ((sampleTime*100) / sampleRealTime) : 0;
if (percAwake != 100) {
pw.print(" with ");
pw.print(percAwake);