diff options
author | Steven Moreland | 2018-09-13 18:05:44 -0500 |
---|---|---|
committer | Steven Moreland | 2018-09-13 18:38:25 -0500 |
commit | 429faabc7379e8cc60be4d97d260df09114553b6 (patch) | |
tree | 8f709a6217e4e2a1121d23ae9a73df35553f081c /tests | |
parent | e1ca153525a1f78ea91780e3d8f9bbadfd426748 (diff) | |
download | platform-hardware-interfaces-429faabc7379e8cc60be4d97d260df09114553b6.tar.gz platform-hardware-interfaces-429faabc7379e8cc60be4d97d260df09114553b6.tar.xz platform-hardware-interfaces-429faabc7379e8cc60be4d97d260df09114553b6.zip |
ISafeUnion: add case w/ enum
Bug: 115638948
Test: hidl_test
Test: hidl_test_java
Change-Id: I26b5cc25bd29c420160686b5572a005a7629784c
Diffstat (limited to 'tests')
-rw-r--r-- | tests/safeunion/1.0/ISafeUnion.hal | 5 | ||||
-rw-r--r-- | tests/safeunion/1.0/default/SafeUnion.cpp | 21 | ||||
-rw-r--r-- | tests/safeunion/1.0/default/SafeUnion.h | 3 |
3 files changed, 29 insertions, 0 deletions
diff --git a/tests/safeunion/1.0/ISafeUnion.hal b/tests/safeunion/1.0/ISafeUnion.hal index c38777a9..f48248b5 100644 --- a/tests/safeunion/1.0/ISafeUnion.hal +++ b/tests/safeunion/1.0/ISafeUnion.hal | |||
@@ -60,6 +60,9 @@ interface ISafeUnion { | |||
60 | } k; | 60 | } k; |
61 | 61 | ||
62 | SmallSafeUnion l; | 62 | SmallSafeUnion l; |
63 | |||
64 | BitField m; | ||
65 | bitfield<BitField> n; | ||
63 | }; | 66 | }; |
64 | 67 | ||
65 | safe_union InterfaceTypeSafeUnion { | 68 | safe_union InterfaceTypeSafeUnion { |
@@ -91,6 +94,8 @@ interface ISafeUnion { | |||
91 | setJ(LargeSafeUnion myUnion, J j) generates (LargeSafeUnion myUnion); | 94 | setJ(LargeSafeUnion myUnion, J j) generates (LargeSafeUnion myUnion); |
92 | setK(LargeSafeUnion myUnion, LargeSafeUnion.K k) generates (LargeSafeUnion myUnion); | 95 | setK(LargeSafeUnion myUnion, LargeSafeUnion.K k) generates (LargeSafeUnion myUnion); |
93 | setL(LargeSafeUnion myUnion, SmallSafeUnion l) generates (LargeSafeUnion myUnion); | 96 | setL(LargeSafeUnion myUnion, SmallSafeUnion l) generates (LargeSafeUnion myUnion); |
97 | setM(LargeSafeUnion myUnion, BitField m) generates (LargeSafeUnion myUnion); | ||
98 | setN(LargeSafeUnion myUnion, bitfield<BitField> m) generates (LargeSafeUnion myUnion); | ||
94 | 99 | ||
95 | newInterfaceTypeSafeUnion() generates (InterfaceTypeSafeUnion myUnion); | 100 | newInterfaceTypeSafeUnion() generates (InterfaceTypeSafeUnion myUnion); |
96 | setInterfaceA(InterfaceTypeSafeUnion myUnion, uint32_t a) generates (InterfaceTypeSafeUnion myUnion); | 101 | setInterfaceA(InterfaceTypeSafeUnion myUnion, uint32_t a) generates (InterfaceTypeSafeUnion myUnion); |
diff --git a/tests/safeunion/1.0/default/SafeUnion.cpp b/tests/safeunion/1.0/default/SafeUnion.cpp index c3956641..4fb09740 100644 --- a/tests/safeunion/1.0/default/SafeUnion.cpp +++ b/tests/safeunion/1.0/default/SafeUnion.cpp | |||
@@ -153,6 +153,27 @@ Return<void> SafeUnion::setL(const LargeSafeUnion& myUnion, const SmallSafeUnion | |||
153 | return Void(); | 153 | return Void(); |
154 | } | 154 | } |
155 | 155 | ||
156 | Return<void> SafeUnion::setM(const LargeSafeUnion& myUnion, BitField m, setL_cb _hidl_cb) { | ||
157 | LOG(INFO) << "SERVER(SafeUnion) setM(myUnion, " << toString(m) << ")"; | ||
158 | |||
159 | LargeSafeUnion myNewUnion = myUnion; | ||
160 | myNewUnion.m(m); | ||
161 | |||
162 | _hidl_cb(myNewUnion); | ||
163 | return Void(); | ||
164 | } | ||
165 | |||
166 | Return<void> SafeUnion::setN(const LargeSafeUnion& myUnion, hidl_bitfield<BitField> n, | ||
167 | setL_cb _hidl_cb) { | ||
168 | LOG(INFO) << "SERVER(SafeUnion) setN(myUnion, " << n << ")"; | ||
169 | |||
170 | LargeSafeUnion myNewUnion = myUnion; | ||
171 | myNewUnion.n(n); | ||
172 | |||
173 | _hidl_cb(myNewUnion); | ||
174 | return Void(); | ||
175 | } | ||
176 | |||
156 | Return<void> SafeUnion::newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) { | 177 | Return<void> SafeUnion::newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) { |
157 | LOG(INFO) << "SERVER(SafeUnion) newInterfaceTypeSafeUnion()"; | 178 | LOG(INFO) << "SERVER(SafeUnion) newInterfaceTypeSafeUnion()"; |
158 | 179 | ||
diff --git a/tests/safeunion/1.0/default/SafeUnion.h b/tests/safeunion/1.0/default/SafeUnion.h index e774e098..ee3a9540 100644 --- a/tests/safeunion/1.0/default/SafeUnion.h +++ b/tests/safeunion/1.0/default/SafeUnion.h | |||
@@ -47,6 +47,9 @@ struct SafeUnion : public ISafeUnion { | |||
47 | Return<void> setJ(const LargeSafeUnion& myUnion, const J& j, setJ_cb _hidl_cb) override; | 47 | Return<void> setJ(const LargeSafeUnion& myUnion, const J& j, setJ_cb _hidl_cb) override; |
48 | Return<void> setK(const LargeSafeUnion& myUnion, const LargeSafeUnion::K& k, setK_cb _hidl_cb) override; | 48 | Return<void> setK(const LargeSafeUnion& myUnion, const LargeSafeUnion::K& k, setK_cb _hidl_cb) override; |
49 | Return<void> setL(const LargeSafeUnion& myUnion, const SmallSafeUnion& l, setL_cb _hidl_cb) override; | 49 | Return<void> setL(const LargeSafeUnion& myUnion, const SmallSafeUnion& l, setL_cb _hidl_cb) override; |
50 | Return<void> setM(const LargeSafeUnion& myUnion, BitField m, setL_cb _hidl_cb) override; | ||
51 | Return<void> setN(const LargeSafeUnion& myUnion, hidl_bitfield<BitField> n, | ||
52 | setL_cb _hidl_cb) override; | ||
50 | 53 | ||
51 | Return<void> newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) override; | 54 | Return<void> newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) override; |
52 | Return<void> setInterfaceA(const InterfaceTypeSafeUnion& myUnion, uint32_t a, setInterfaceA_cb _hidl_cb) override; | 55 | Return<void> setInterfaceA(const InterfaceTypeSafeUnion& myUnion, uint32_t a, setInterfaceA_cb _hidl_cb) override; |