commit a992384718c2b4953864212ce1764323f6894206
author Steven Moreland <smoreland@google.com> Tue Apr 23 16:03:18 2019 -0700
committer hamzeh <hamzeh@google.com> Fri May 10 15:54:34 2019 -0700
tree 3500ab2a2b409427abaf832a063217d19b6c886d
parent b6633a0d78ffedfa1686ed194c8da94d2e8288bd

Zero hidl-generated structs

Bug: 131356202
Test: boot, lshal
Change-Id: I8fb10532b6fdf9afa419f19fc634981e7cbd3c10
Merged-In: I8fb10532b6fdf9afa419f19fc634981e7cbd3c10
(cherry picked from commit c8b4c6d9dd41ab3435e05ddf62e63d56139538e5)

Interface.cpp

diff --git a/Interface.cpp b/Interface.cpp
index 061c37b..9a5d45d 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -382,24 +382,24 @@
             {IMPL_INTERFACE,
                 [this](auto &out) {
                     // getDebugInfo returns N/A for local objects.
-                    out << "_hidl_cb({ -1 /* pid */, 0 /* ptr */, \n"
-                        << sArch
-                        << "});\n"
-                        << "return ::android::hardware::Void();";
+                    out << "::android::hidl::base::V1_0::DebugInfo info = {};\n";
+                    out << "info.pid = -1;\n";
+                    out << "info.ptr = 0;\n";
+                    out << "info.arch = \n" << sArch << ";\n";
+                    out << "_hidl_cb(info);\n";
+                    out << "return ::android::hardware::Void();\n";
                 }
             },
             {IMPL_STUB_IMPL,
                 [this](auto &out) {
-                    out << "_hidl_cb(";
-                    out.block([&] {
-                        out << "::android::hardware::details::debuggable()"
-                            << "? getpid() : -1 /* pid */,\n"
-                            << "::android::hardware::details::debuggable()"
-                            << "? reinterpret_cast<uint64_t>(this) : 0 /* ptr */,\n"
-                            << sArch << "\n";
-                    });
-                    out << ");\n"
-                        << "return ::android::hardware::Void();";
+                    out << "::android::hidl::base::V1_0::DebugInfo info = {};\n";
+                    out << "info.pid = ::android::hardware::details::debuggable()"
+                        << "? getpid() : -1 /* pid */,\n";
+                    out << "info.ptr = ::android::hardware::details::debuggable()"
+                        << "? reinterpret_cast<uint64_t>(this) : 0;\n";
+                    out << "info.arch = \n" << sArch << ";\n";
+                    out << "_hidl_cb(info);\n";
+                    out << "return ::android::hardware::Void();\n";
                 }
             }
         }, /* cppImpl */