Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Make safeunion@1.0 test HAL Java-compatible"

Browse Source 
am: 314f9503a9

Change-Id: Ieaad7392eb81605d1ae0b626db5c1f336eb6d10b
This commit is contained in:
Nirav Atre
2018-07-13 12:49:56 -07:00
committed by android-build-merger
parent bf03ebe580 314f9503a9
commit bb18da12bc
4 changed files with 1 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/safeunion/1.0/Android.bp
View File

@@ -10,6 +10,6 @@ hidl_interface {
interfaces: [
"android.hidl.base@1.0",
],
gen_java: false,
gen_java: true,
}

13
tests/safeunion/1.0/ISafeUnion.hal
View File

@@ -62,14 +62,6 @@ interface ISafeUnion {
SmallSafeUnion l;
};
// TODO(b/110269925): Test more HIDL types. Missing:
// death_recipient, fmq_{sync,unsync}, pointer, ref.
safe_union MiscTypesSafeUnion {
memory a;
handle b;
bitfield<BitField> c;
};
safe_union InterfaceTypeSafeUnion {
uint32_t a;
int8_t[7] b;
@@ -90,11 +82,6 @@ interface ISafeUnion {
setK(LargeSafeUnion myUnion, LargeSafeUnion.K k) generates (LargeSafeUnion myUnion);
setL(LargeSafeUnion myUnion, SmallSafeUnion l) generates (LargeSafeUnion myUnion);
newMiscTypesSafeUnion() generates (MiscTypesSafeUnion myUnion);
setMiscA(MiscTypesSafeUnion myUnion, memory a) generates (MiscTypesSafeUnion myUnion);
setMiscB(MiscTypesSafeUnion myUnion, handle b) generates (MiscTypesSafeUnion myUnion);
setMiscC(MiscTypesSafeUnion myUnion, bitfield<BitField> c) generates (MiscTypesSafeUnion myUnion);
newInterfaceTypeSafeUnion() generates (InterfaceTypeSafeUnion myUnion);
setInterfaceA(InterfaceTypeSafeUnion myUnion, uint32_t a) generates (InterfaceTypeSafeUnion myUnion);
setInterfaceB(InterfaceTypeSafeUnion myUnion, int8_t[7] b) generates (InterfaceTypeSafeUnion myUnion);

38
tests/safeunion/1.0/default/SafeUnion.cpp
View File

@@ -153,44 +153,6 @@ Return<void> SafeUnion::setL(const LargeSafeUnion& myUnion, const SmallSafeUnion
return Void();
}
Return<void> SafeUnion::newMiscTypesSafeUnion(newMiscTypesSafeUnion_cb _hidl_cb) {
LOG(INFO) << "SERVER(SafeUnion) newMiscTypesSafeUnion()";
MiscTypesSafeUnion ret;
_hidl_cb(ret);
return Void();
}
Return<void> SafeUnion::setMiscA(const MiscTypesSafeUnion& myUnion, const hidl_memory& a, setMiscA_cb _hidl_cb) {
LOG(INFO) << "SERVER(SafeUnion) setMiscA(myUnion, " << toString(a) << ")";
MiscTypesSafeUnion myNewUnion = myUnion;
myNewUnion.a(a);
_hidl_cb(myNewUnion);
return Void();
}
Return<void> SafeUnion::setMiscB(const MiscTypesSafeUnion& myUnion, const hidl_handle& b, setMiscB_cb _hidl_cb) {
LOG(INFO) << "SERVER(SafeUnion) setMiscB(myUnion, " << toString(b) << ")";
MiscTypesSafeUnion myNewUnion = myUnion;
myNewUnion.b(b);
_hidl_cb(myNewUnion);
return Void();
}
Return<void> SafeUnion::setMiscC(const MiscTypesSafeUnion& myUnion, hidl_bitfield<BitField> c, setMiscC_cb _hidl_cb) {
LOG(INFO) << "SERVER(SafeUnion) setMiscC(myUnion, " << c << ")";
MiscTypesSafeUnion myNewUnion = myUnion;
myNewUnion.c(c);
_hidl_cb(myNewUnion);
return Void();
}
Return<void> SafeUnion::newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) {
LOG(INFO) << "SERVER(SafeUnion) newInterfaceTypeSafeUnion()";

5
tests/safeunion/1.0/default/SafeUnion.h
View File

@@ -48,11 +48,6 @@ struct SafeUnion : public ISafeUnion {
Return<void> setK(const LargeSafeUnion& myUnion, const LargeSafeUnion::K& k, setK_cb _hidl_cb) override;
Return<void> setL(const LargeSafeUnion& myUnion, const SmallSafeUnion& l, setL_cb _hidl_cb) override;
Return<void> newMiscTypesSafeUnion(newMiscTypesSafeUnion_cb _hidl_cb) override;
Return<void> setMiscA(const MiscTypesSafeUnion& myUnion, const hidl_memory& a, setMiscA_cb _hidl_cb) override;
Return<void> setMiscB(const MiscTypesSafeUnion& myUnion, const hidl_handle& b, setMiscB_cb _hidl_cb) override;
Return<void> setMiscC(const MiscTypesSafeUnion& myUnion, hidl_bitfield<BitField> c, setMiscC_cb _hidl_cb) override;
Return<void> newInterfaceTypeSafeUnion(newInterfaceTypeSafeUnion_cb _hidl_cb) override;
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;