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

Author: Dianne Hackborn

core/java/com/android/internal/os/ProcessStats.java

@@ -619,8 +619,11 @@ final public int getLastIdleTime() {
     }
 
     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 @@ final public String printCurrentState(long now) {
 
         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);