Merge "Add resident shared memory to the ANR Memory headers" into udc-dev
diff --git a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java
index e66894b..70a696c 100644
--- a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java
+++ b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java
@@ -732,6 +732,7 @@
.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();
}