diff options
author | Nirav Atre <natre@google.com> | 2018-07-16 17:16:02 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-16 17:16:02 -0700 |
commit | 1233e0a7eb21d36220d1e3c6cbd1dbf6881e9e99 (patch) | |
tree | 8a2c83fce6ecb7a786b3152e6a6f89f6e85f85cf /tests | |
parent | 7151988f6258bf2db7360639f35211f8ae9db9e8 (diff) | |
parent | 76b383d5c2f5ec50f7102aca6700ced8bcb05601 (diff) | |
download | android_hardware_interfaces-1233e0a7eb21d36220d1e3c6cbd1dbf6881e9e99.tar.gz android_hardware_interfaces-1233e0a7eb21d36220d1e3c6cbd1dbf6881e9e99.tar.bz2 android_hardware_interfaces-1233e0a7eb21d36220d1e3c6cbd1dbf6881e9e99.zip |
Merge "Updated HALs to test structs/safe_unions containing interfaces"
am: 76b383d5c2
Change-Id: Idbf119111f9d3a1e916b4753bc68aec35638a275
Diffstat (limited to 'tests')
-rw-r--r-- | tests/baz/1.0/IBaz.hal | 3 | ||||
-rw-r--r-- | tests/safeunion/1.0/ISafeUnion.hal | 4 | ||||
-rw-r--r-- | tests/safeunion/1.0/default/SafeUnion.cpp | 20 | ||||
-rw-r--r-- | tests/safeunion/1.0/default/SafeUnion.h | 2 |
4 files changed, 29 insertions, 0 deletions
diff --git a/tests/baz/1.0/IBaz.hal b/tests/baz/1.0/IBaz.hal index 9a9e75451..00fe5686a 100644 --- a/tests/baz/1.0/IBaz.hal +++ b/tests/baz/1.0/IBaz.hal @@ -70,6 +70,9 @@ interface IBaz extends IBase { struct StructWithInterface { int32_t number; + int8_t[7] array; + string oneString; + vec<string> vectorOfStrings; IBase dummy; }; oneway doThis(float param); diff --git a/tests/safeunion/1.0/ISafeUnion.hal b/tests/safeunion/1.0/ISafeUnion.hal index fedd63b8e..e56022f41 100644 --- a/tests/safeunion/1.0/ISafeUnion.hal +++ b/tests/safeunion/1.0/ISafeUnion.hal @@ -66,6 +66,8 @@ interface ISafeUnion { uint32_t a; int8_t[7] b; IOtherInterface c; + string d; + vec<string> e; }; newLargeSafeUnion() generates (LargeSafeUnion myUnion); @@ -86,4 +88,6 @@ interface ISafeUnion { setInterfaceA(InterfaceTypeSafeUnion myUnion, uint32_t a) generates (InterfaceTypeSafeUnion myUnion); setInterfaceB(InterfaceTypeSafeUnion myUnion, int8_t[7] b) generates (InterfaceTypeSafeUnion myUnion); setInterfaceC(InterfaceTypeSafeUnion myUnion, IOtherInterface c) generates (InterfaceTypeSafeUnion myUnion); + setInterfaceD(InterfaceTypeSafeUnion myUnion, string d) generates (InterfaceTypeSafeUnion myUnion); + setInterfaceE(InterfaceTypeSafeUnion myUnion, vec<string> e) generates (InterfaceTypeSafeUnion myUnion); }; diff --git a/tests/safeunion/1.0/default/SafeUnion.cpp b/tests/safeunion/1.0/default/SafeUnion.cpp index 7047d1612..11b2e3678 100644 --- a/tests/safeunion/1.0/default/SafeUnion.cpp +++ b/tests/safeunion/1.0/default/SafeUnion.cpp @@ -191,6 +191,26 @@ Return<void> SafeUnion::setInterfaceC(const InterfaceTypeSafeUnion& myUnion, con return Void(); } +Return<void> SafeUnion::setInterfaceD(const ::android::hardware::tests::safeunion::V1_0::ISafeUnion::InterfaceTypeSafeUnion& myUnion, const hidl_string& d, setInterfaceD_cb _hidl_cb) { + LOG(INFO) << "SERVER(SafeUnion) setInterfaceD(myUnion, " << toString(d) << ")"; + + InterfaceTypeSafeUnion myNewUnion = myUnion; + myNewUnion.d(d); + + _hidl_cb(myNewUnion); + return Void(); +} + +Return<void> SafeUnion::setInterfaceE(const ::android::hardware::tests::safeunion::V1_0::ISafeUnion::InterfaceTypeSafeUnion& myUnion, const hidl_vec<hidl_string>& e, setInterfaceE_cb _hidl_cb) { + LOG(INFO) << "SERVER(SafeUnion) setInterfaceE(myUnion, " << toString(e) << ")"; + + InterfaceTypeSafeUnion myNewUnion = myUnion; + myNewUnion.e(e); + + _hidl_cb(myNewUnion); + return Void(); +} + ISafeUnion* HIDL_FETCH_ISafeUnion(const char* /* name */) { return new SafeUnion(); } diff --git a/tests/safeunion/1.0/default/SafeUnion.h b/tests/safeunion/1.0/default/SafeUnion.h index 07d88d23b..e900fcec3 100644 --- a/tests/safeunion/1.0/default/SafeUnion.h +++ b/tests/safeunion/1.0/default/SafeUnion.h @@ -52,6 +52,8 @@ struct SafeUnion : public ISafeUnion { Return<void> setInterfaceA(const InterfaceTypeSafeUnion& myUnion, uint32_t a, setInterfaceA_cb _hidl_cb) override; Return<void> setInterfaceB(const InterfaceTypeSafeUnion& myUnion, const hidl_array<int8_t, 7>& b, setInterfaceB_cb _hidl_cb) override; Return<void> setInterfaceC(const InterfaceTypeSafeUnion& myUnion, const sp<::android::hardware::tests::safeunion::V1_0::IOtherInterface>& c, setInterfaceC_cb _hidl_cb) override; + Return<void> setInterfaceD(const InterfaceTypeSafeUnion& myUnion, const hidl_string& d, setInterfaceD_cb _hidl_cb) override; + Return<void> setInterfaceE(const InterfaceTypeSafeUnion& myUnion, const hidl_vec<hidl_string>& e, setInterfaceE_cb _hidl_cb) override; }; extern "C" ISafeUnion* HIDL_FETCH_ISafeUnion(const char* name); |