commit dfb73b4e0651e8f554aba73be9461b1821c49fac
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 10 01:21:54 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 10 01:21:55 2017 +0000
tree 4010c5a420d1a5e3e8d475451d79793f928eb3f5
parent b349e0171e2f175c07076eeafc1555929db9cacb
parent 0b515ab17bcd37b19ba7ec9edddc63f6d9f2858f

Merge "Remove unnecessary code in HIDL test."

MemoryType.cpp

diff --git a/MemoryType.cpp b/MemoryType.cpp
index e85fc87..857bf05 100644
--- a/MemoryType.cpp
+++ b/MemoryType.cpp
@@ -46,7 +46,7 @@
 }
 
 std::string MemoryType::getVtsType() const {
-    return "TYPE_MEMORY";
+    return "TYPE_HIDL_MEMORY";
 }
 
 void MemoryType::emitReaderWriter(

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 69b5f8e..a4af202 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -1627,9 +1627,17 @@
             out << "_hidl_cb(*_hidl_reply);\n";
 
             out.unindent();
-            out << "}\n";
+            out << "});\n\n";
+        } else {
+            out << ");\n\n";
+            status_t status = generateCppInstrumentationCall(
+                    out,
+                    InstrumentationEvent::SERVER_API_EXIT,
+                    method);
+            if (status != OK) {
+                return status;
+            }
         }
-        out << ");\n\n";
 
         if (returnsValue) {
             out << "if (!_hidl_callbackCalled) {\n";