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

Merge "Check if RssAnon and swap were read" into rvc-dev am: b0a6429fcf am: 806f779ccd

Browse Source 
Change-Id: Idecd90649fe18e43f140f2361350abcd3f9d5dc6
This commit is contained in:
TreeHugger Robot
2020-04-16 08:59:24 +00:00
committed by Automerger Merge Worker
parent a563943888 806f779ccd
commit 582adfad6d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/stats/pull/ProcfsMemoryUtil.java
View File

@@ -41,10 +41,11 @@ public final class ProcfsMemoryUtil {
public static MemorySnapshot readMemorySnapshotFromProcfs(int pid) { public static MemorySnapshot readMemorySnapshotFromProcfs(int pid) {
long[] output = new long[STATUS_KEYS.length]; long[] output = new long[STATUS_KEYS.length];
output[0] = -1; output[0] = -1;
output[3] = -1;
output[4] = -1;
Process.readProcLines("/proc/" + pid + "/status", STATUS_KEYS, output); Process.readProcLines("/proc/" + pid + "/status", STATUS_KEYS, output);
if (output[0] == -1 || (output[3] == 0 && output[4] == 0)) { if (output[0] == -1 || output[3] == -1 || output[4] == -1) {
// Could not open file or anon rss / swap are 0 indicating the process is in a zombie // Could not open or parse file.
// state.
return null; return null;
} }
final MemorySnapshot snapshot = new MemorySnapshot(); final MemorySnapshot snapshot = new MemorySnapshot();