Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd19e02 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents e60a35c1 cdadee63

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

+6 −3
Original line number Diff line number Diff line
@@ -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);