Add toBinder to all interfaces.
Test: hidl_test
Bug: 32001926
Change-Id: Ibe45c3791ed2ab750cc246a56c4cb7b0483386fc
diff --git a/Interface.cpp b/Interface.cpp
index 1d0f37a..d348101 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -252,33 +252,12 @@
out.unindent();
out << "}\n\n";
} else {
+ out << "_hidl_err = "
+ << parcelObjDeref
+ << "writeStrongBinder("
+ << name
+ << "->toBinder());\n";
- out << "if (" << name << "->isRemote()) {\n";
- out.indent();
- out << "_hidl_err = ";
- out << parcelObjDeref
- << "writeStrongBinder("
- << fqName().cppNamespace()
- << "::IHw"
- << getBaseName()
- << "::asBinder(static_cast<"
- << fqName().cppNamespace()
- << "::IHw"
- << getBaseName()
- << "*>("
- << name << ".get()"
- << ")));\n";
- out.unindent();
- out << "} else {\n";
- out.indent();
- out << "_hidl_err = ";
- out << parcelObjDeref
- << "writeStrongBinder("
- << "new " << fqName().cppNamespace()
- << "::Bn" << getBaseName() << " "
- << "(" << name <<"));\n";
- out.unindent();
- out << "}\n";
handleError(out, mode);
}
}