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

Commit 68e95689 authored by Mohamad Mahmoud's avatar Mohamad Mahmoud Committed by Automerger Merge Worker
Browse files

Merge "Add resident shared memory to the ANR Memory headers" into udc-dev am:... 

Merge "Add resident shared memory to the ANR Memory headers" into udc-dev am: 90a7bd1f am: 13a5cb85

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22379583



Change-Id: I106181e63203169bbfaf5ccc28ea971330765040
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fec129d 13a5cb85

services/core/java/com/android/server/am/ProcessErrorStateRecord.java

+1 −0
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ class ProcessErrorStateRecord { 
            .append("\n");

        memoryHeaders.append("RssKb: ").append(snapshot.rssInKilobytes).append("\n");

        memoryHeaders.append("RssAnonKb: ").append(snapshot.anonRssInKilobytes).append("\n");

        memoryHeaders.append("RssShmemKb: ").append(snapshot.rssShmemKilobytes).append("\n");

        memoryHeaders.append("VmSwapKb: ").append(snapshot.swapInKilobytes).append("\n");

        return memoryHeaders.toString();

    }