commit 33e622a58a10e997c47a2c07c60240552563e216
author Josh Gao <jmgao@google.com> Thu May 16 16:05:04 2019 -0700
committer Josh Gao <jmgao@google.com> Thu May 16 17:08:55 2019 -0700
tree c8c129e2c370340089da6d06fe496a9876313e7b
parent df23713dc7ca28d776153ef4d8e216f3df3b1b1a

Update IsZygote to return true for USAPs.

Bug: http://b/132912216
Test: treehugger
Change-Id: I677d7e22e8d78b6dd92f0c35e9493acc6524c0e0

libs/dumputils/dump_utils.cpp

diff --git a/libs/dumputils/dump_utils.cpp b/libs/dumputils/dump_utils.cpp
index 26c2a0d..a00459d 100644
--- a/libs/dumputils/dump_utils.cpp
+++ b/libs/dumputils/dump_utils.cpp
@@ -110,13 +110,15 @@
 }
 
 bool IsZygote(int pid) {
-    static const std::string kZygotePrefix = "zygote";
-
     std::string cmdline;
     if (!android::base::ReadFileToString(android::base::StringPrintf("/proc/%d/cmdline", pid),
                                          &cmdline)) {
         return true;
     }
 
-    return (cmdline.find(kZygotePrefix) == 0);
+    // cmdline has embedded nulls; only consider argv[0].
+    cmdline = std::string(cmdline.c_str());
+
+    return cmdline == "zygote" || cmdline == "zygote64" || cmdline == "usap32" ||
+            cmdline == "usap64";
 }