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

Commit 582adfad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: Idecd90649fe18e43f140f2361350abcd3f9d5dc6
parents a5639438 806f779c

services/core/java/com/android/server/stats/pull/ProcfsMemoryUtil.java

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