commit b2d8e4f0f365f03268b0ef4e6d135ab9e11abf92
author Guang Zhu <guangzhu@google.com> Fri Nov 20 01:46:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 20 01:46:25 2015 +0000
tree 3123c095dffcbd380289eec04920769af8f41b09
parent 12262af418f139e189b09b5b1e8a775d41d42e8e
parent d5502258356402213692118941c968a4bf6a56d1

Merge "resolve merge conflicts of 723462eba9 to master."

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index b7ce3221..29173a5 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15468,6 +15468,10 @@
                 pw.print(" Lost RAM: "); pw.println(stringifyKBSize(memInfo.getTotalSizeKb()
                         - totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()
                         - memInfo.getKernelUsedSizeKb()));
+            } else {
+                pw.print("lostram,"); pw.println(memInfo.getTotalSizeKb()
+                        - totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()
+                        - memInfo.getKernelUsedSizeKb());
             }
             if (!brief) {
                 if (memInfo.getZramTotalSizeKb() != 0) {