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

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

Browse Source 
* commit 'f13fe14853ca13830e2bf293f3a24a965570b507':
  ProcessCpuTracker touching proc is fine.
This commit is contained in:
Jeff Sharkey
2014-11-07 23:13:41 +00:00
committed by Android Git Automerger
parent b63fd56b39 f13fe14853
commit 284ab646d8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/os/ProcessCpuTracker.java
View File

@@ -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;
} }
mCurPids = collectStats("/proc", -1, mFirst, mCurPids, mProcStats); final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskReads();
try {
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;