Merge "Add hwtypes.h to -Landroidbp"
diff --git a/Interface.cpp b/Interface.cpp
index abf7317..6cd6e94 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -79,7 +79,7 @@
method->fillImplementation(
HIDL_PING_TRANSACTION,
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[](auto &out) {
out << "return ::android::hardware::Void();\n";
}
@@ -91,7 +91,7 @@
}
}, /*cppImpl*/
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[this](auto &out) {
out << "return;\n";
}
@@ -111,7 +111,7 @@
method->fillImplementation(
HIDL_LINK_TO_DEATH_TRANSACTION,
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[](auto &out) {
out << "(void)cookie;\n"
<< "return (recipient != nullptr);\n";
@@ -131,7 +131,7 @@
{IMPL_STUB, nullptr}
}, /*cppImpl*/
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[this](auto &out) {
out << "return true;";
}
@@ -155,7 +155,7 @@
method->fillImplementation(
HIDL_UNLINK_TO_DEATH_TRANSACTION,
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[](auto &out) {
out << "return (recipient != nullptr);\n";
}
@@ -180,7 +180,7 @@
{IMPL_STUB, nullptr /* don't generate code */}
}, /*cppImpl*/
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[this](auto &out) {
out << "return true;\n";
}
@@ -202,11 +202,11 @@
method->fillImplementation(
HIDL_SYSPROPS_CHANGED_TRANSACTION,
- { { IMPL_HEADER, [this](auto &out) {
+ { { IMPL_INTERFACE, [this](auto &out) {
out << "::android::report_sysprop_change();\n";
out << "return ::android::hardware::Void();";
} } }, /*cppImpl */
- { { IMPL_HEADER, [](auto &out) { /* javaImpl */
+ { { IMPL_INTERFACE, [](auto &out) { /* javaImpl */
out << "android.os.SystemProperties.reportSyspropChanged();";
} } } /*javaImpl */
);
@@ -221,7 +221,7 @@
method->fillImplementation(
HIDL_SET_HAL_INSTRUMENTATION_TRANSACTION,
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[this](auto &out) {
// do nothing for base class.
out << "return ::android::hardware::Void();\n";
@@ -239,7 +239,7 @@
}
},
}, /*cppImpl */
- { { IMPL_HEADER, [](auto & /*out*/) { /* javaImpl */
+ { { IMPL_INTERFACE, [](auto & /*out*/) { /* javaImpl */
// Not support for Java Impl for now.
} } } /*javaImpl */
);
@@ -253,7 +253,7 @@
method->fillImplementation(
HIDL_DESCRIPTOR_CHAIN_TRANSACTION,
- { { IMPL_HEADER, [this](auto &out) {
+ { { IMPL_INTERFACE, [this](auto &out) {
std::vector<const Interface *> chain = typeChain();
out << "_hidl_cb(";
out.block([&] {
@@ -264,7 +264,7 @@
out << ");\n";
out << "return ::android::hardware::Void();";
} } }, /* cppImpl */
- { { IMPL_HEADER, [this](auto &out) {
+ { { IMPL_INTERFACE, [this](auto &out) {
std::vector<const Interface *> chain = typeChain();
out << "return new java.util.ArrayList<String>(java.util.Arrays.asList(\n";
out.indent(); out.indent();
@@ -287,13 +287,13 @@
method->fillImplementation(
HIDL_GET_DESCRIPTOR_TRANSACTION,
- { { IMPL_HEADER, [this](auto &out) {
+ { { IMPL_INTERFACE, [this](auto &out) {
out << "_hidl_cb("
<< fullName()
<< "::descriptor);\n"
<< "return ::android::hardware::Void();";
} } }, /* cppImpl */
- { { IMPL_HEADER, [this](auto &out) {
+ { { IMPL_INTERFACE, [this](auto &out) {
out << "return "
<< fullJavaName()
<< ".kInterfaceName;\n";
@@ -317,7 +317,7 @@
method->fillImplementation(
HIDL_GET_REF_INFO_TRANSACTION,
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[this](auto &out) {
// getDebugInfo returns N/A for local objects.
out << "_hidl_cb({ -1 /* pid */, 0 /* ptr */, \n"
@@ -341,7 +341,7 @@
}
}
}, /* cppImpl */
- { { IMPL_HEADER, [this, method](auto &out) {
+ { { IMPL_INTERFACE, [this, method](auto &out) {
const Type &refInfo = method->results().front()->type();
out << refInfo.getJavaType(false /* forInitializer */) << " info = new "
<< refInfo.getJavaType(true /* forInitializer */) << "();\n"
@@ -364,7 +364,7 @@
method->fillImplementation(
HIDL_DEBUG_TRANSACTION,
{
- {IMPL_HEADER,
+ {IMPL_INTERFACE,
[this](auto &out) {
out << "(void)fd;\n"
<< "(void)options;\n"
diff --git a/Method.cpp b/Method.cpp
index 9d40856..c967d89 100644
--- a/Method.cpp
+++ b/Method.cpp
@@ -47,7 +47,7 @@
mJavaImpl = javaImpl;
CHECK(mJavaImpl.find(IMPL_STUB_IMPL) == mJavaImpl.end())
- << "FATAL: mJavaImpl should not use IMPL_STUB_IMPL; use IMPL_HEADER instead.";
+ << "FATAL: mJavaImpl should not use IMPL_STUB_IMPL; use IMPL_INTERFACE instead.";
CHECK(mCppImpl.find(IMPL_STUB_IMPL) == mCppImpl.end() ||
mCppImpl.find(IMPL_STUB) == mCppImpl.end())
<< "FATAL: mCppImpl IMPL_STUB will override IMPL_STUB_IMPL.";
diff --git a/Method.h b/Method.h
index 38f0dd2..229f042 100644
--- a/Method.h
+++ b/Method.h
@@ -36,7 +36,7 @@
struct TypedVarVector;
enum MethodImplType {
- IMPL_HEADER,
+ IMPL_INTERFACE,
IMPL_PROXY,
IMPL_STUB, // overrides the code in onTransact; IMPL_STUB_IMPL will be ignored
IMPL_STUB_IMPL, // use this->method() instead of mImpl->method()
diff --git a/generateCpp.cpp b/generateCpp.cpp
index 26765bb..178b705 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -240,7 +240,7 @@
// to hwservicemanager or to the service itself (interfaceChain
// is not consistent)
// In all cases, try again.
- out << "ALOGW(\"getService: found null interface\");\n"
+ out << "ALOGW(\"getService: found null hwbinder interface\");\n"
<< "continue;\n";
}).endl();
@@ -1900,7 +1900,7 @@
method->generateCppSignature(out, iface->localName());
if (reserved) {
out.block([&]() {
- method->cppImpl(IMPL_HEADER, out);
+ method->cppImpl(IMPL_INTERFACE, out);
}).endl();
}
diff --git a/generateJava.cpp b/generateJava.cpp
index 0694a82..36cef4e 100644
--- a/generateJava.cpp
+++ b/generateJava.cpp
@@ -479,7 +479,7 @@
<< ") {\n";
out.indent();
- method->javaImpl(IMPL_HEADER, out);
+ method->javaImpl(IMPL_INTERFACE, out);
out.unindent();
out << "\n}\n\n";
}
