From 9d320e3fbe8c46d6eecd24d3398edc145e2ff4fa Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 2 Oct 2017 14:47:35 -0700 Subject: [PATCH] Update inheritance test implementation. HIDL_FETCH_IParent returns a child object when the "child" instance name is requested. Bug: 67104214 Test: hidl's run_all_device_tests.sh Change-Id: Ie4b85d657e5d066fb77832e188062af29bc2e7c6 --- tests/inheritance/1.0/default/Parent.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/inheritance/1.0/default/Parent.cpp b/tests/inheritance/1.0/default/Parent.cpp index d3f1932530..1fabf1bff2 100644 --- a/tests/inheritance/1.0/default/Parent.cpp +++ b/tests/inheritance/1.0/default/Parent.cpp @@ -1,8 +1,10 @@ #define LOG_TAG "hidl_test" +#include "Parent.h" + #include -#include "Parent.h" +#include "Child.h" namespace android { namespace hardware { @@ -23,8 +25,11 @@ Return Parent::doParent() { return Void(); } +IParent* HIDL_FETCH_IParent(const char* name) { + if (name == std::string("child")) { + return new Child(); + } -IParent* HIDL_FETCH_IParent(const char* /* name */) { return new Parent(); }