| commit | 820991c962d26d29971a7c9053dd211b2d6eb423 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Mon Dec 05 12:11:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 05 12:11:05 2022 +0000 |
| tree | 513fb994a8f483eb62d9d8cd228fbf2b750b1ed2 | |
| parent | 69d69f695c2bfbe7ba5c57e9861e6739068ac9e3 [diff] | |
| parent | 97bf543c6816eddea128ffbe55e822f1cbdfca0d [diff] |
More robust parsing of /proc/meminfo am: 97bf543c68 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2327374 Change-Id: Idd2fc742b39b1ad60d6334f31ce70d7887e49682 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java b/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java index d85929d..940ec9c 100644 --- a/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java +++ b/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java
@@ -99,12 +99,14 @@ if (line.length() == 0) { continue; } - if (line.contains(": ")) { + // Each line is '<metrics>: <number> kB'. + // EX : Pss_Anon: 70712 kB + // EX : Active(file): 5792 kB + // EX : ProtectionKey: 0 + if (line.matches("[\\w()]+:\\s+.*")) { if (entries.size() == 0) { throw new RuntimeException("unexpected line: " + line); } - // Each line is '<metrics>: <number> kB'. - // EX : Pss_Anon: 70712 kB if (line.endsWith(" kB")) line = line.substring(0, line.length() - 3); String[] elems = line.split(":"); String name = elems[0].trim();