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

Commit ccce016f authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

ProcessCpuTracker touching proc is fine. 

Otherwise we spew hundreds of StrictMode violations.

Bug: 18261125
Change-Id: I2e5ff697b99f55bb73e806f04dba8384e6f1b935
parent 7efdb83c

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

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

import android.os.SystemClock;

import android.util.Slog;



import com.android.internal.util.FastPrintWriter;



import libcore.io.IoUtils;



import java.io.File;

import java.io.FileInputStream;

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

        }



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

        try {

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

        } finally {

            StrictMode.setThreadPolicy(savedPolicy);

        }



        final float[] loadAverages = mLoadAverageData;

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

        } catch (java.io.IOException e) {

        } finally {

            if (is != null) {

                try {

                    is.close();

                } catch (java.io.IOException e) {

                }

            }

            IoUtils.closeQuietly(is);

            StrictMode.setThreadPolicy(savedPolicy);

        }

        return null;