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

Commit 560893ce authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 284ab646: am f13fe148: am 001b2e93: Merge "ProcessCpuTracker touching proc... 

am 284ab646: am f13fe148: am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev

* commit '284ab646':
  ProcessCpuTracker touching proc is fine.
parents be98cdce 284ab646

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

+10 −7
Original line number Original line Diff line number Diff line
@@ -23,8 +23,11 @@ import android.os.Process; 
import android.os.StrictMode;

import android.os.StrictMode;

import android.os.SystemClock;

import android.os.SystemClock;

import android.util.Slog;

import android.util.Slog;



import com.android.internal.util.FastPrintWriter;

import com.android.internal.util.FastPrintWriter;





import libcore.io.IoUtils;



import java.io.File;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileInputStream;

import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -325,7 +328,12 @@ public class ProcessCpuTracker { 
            mBaseIdleTime = idletime;

            mBaseIdleTime = idletime;

        }

        }





        final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskReads();

        try {

            mCurPids = collectStats("/proc", -1, mFirst, mCurPids, mProcStats);

            mCurPids = collectStats("/proc", -1, mFirst, mCurPids, mProcStats);

        } finally {

            StrictMode.setThreadPolicy(savedPolicy);

        }





        final float[] loadAverages = mLoadAverageData;

        final float[] loadAverages = mLoadAverageData;

        if (Process.readProcFile("/proc/loadavg", LOAD_AVERAGE_FORMAT,

        if (Process.readProcFile("/proc/loadavg", LOAD_AVERAGE_FORMAT,
@@ -847,12 +855,7 @@ public class ProcessCpuTracker { 
        } catch (java.io.FileNotFoundException e) {

        } catch (java.io.FileNotFoundException e) {

        } catch (java.io.IOException e) {

        } catch (java.io.IOException e) {

        } finally {

        } finally {

            if (is != null) {

            IoUtils.closeQuietly(is);

                try {

                    is.close();

                } catch (java.io.IOException e) {

                }

            }

            StrictMode.setThreadPolicy(savedPolicy);

            StrictMode.setThreadPolicy(savedPolicy);

        }

        }

        return null;

        return null;