Snap for 5600800 from 8b20a45f29ebb35324b0fba2fc5e0b856047aebb to pi-platform-release
am: 1df6c91f83

Change-Id: I5b2c358f1599205159fa98efd8542414480b8da7

Interface.cpp

diff --git a/Interface.cpp b/Interface.cpp
index d18ceaa..1c66b31 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -382,23 +382,23 @@
             {IMPL_INTERFACE,
                 [](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,
                 [](auto &out) {
-                    out << "_hidl_cb(";
-                    out.block([&] {
-                        out << "::android::hardware::details::getPidIfSharable(),\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::getPidIfSharable();\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 */