commit e89c5ffd23c4b58f5e5751b0a4942f894ddfba1d
author Jeongik Cha <jeongik@google.com> Fri Apr 05 02:16:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 05 02:16:26 2019 +0000
tree 85d67b781e092a3f2a08b4feb0468afd705aa1f9
parent 1002c2cf1aaf140e132f93538431d02df46c4785
parent b7775e555299eb09a2f4bb4dd01fe11f786cd47a

Merge "Change parameter in log to array of pair."

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index a455876..6236e45 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -164,7 +164,6 @@
         std::string output;
         const Json::Value& inputArgs = logTransaction["input_args"];
         const Json::Value& returnArgs = logTransaction["_aidl_return"];
-        Json::Value::Members member = inputArgs.getMemberNames();
 
         hasReturnArgs = !returnArgs.empty();
         output.append(logTransaction["method_name"].asString().c_str() + std::string("("));
@@ -172,11 +171,11 @@
         // input args
         Json::FastWriter fastWriter;
         fastWriter.omitEndingLineFeed();
-        for (Json::Value::Members::iterator iter = member.begin(); iter != member.end(); ++iter) {
-            std::string value = fastWriter.write(inputArgs[(*iter).c_str()]);
+        for (Json::Value::ArrayIndex i = 0; i != inputArgs.size(); i++) {
+            std::string value = fastWriter.write(inputArgs[i]["value"]);
             if (value.empty()) value = std::string("null");
             output.append(value);
-            if (iter != member.end() - 1) {
+            if (i != inputArgs.size() - 1) {
                 output.append(", ");
             }
         }