Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b383d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Updated HALs to test structs/safe_unions containing interfaces"

parents 8b833740 6a8d93f3

tests/baz/1.0/IBaz.hal

+3 −0
Original line number Diff line number Diff line
@@ -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);

tests/safeunion/1.0/ISafeUnion.hal

+4 −0
Original line number Diff line number Diff line
@@ -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);

};

tests/safeunion/1.0/default/SafeUnion.cpp

+20 −0
Original line number Diff line number Diff line
@@ -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();

}

tests/safeunion/1.0/default/SafeUnion.h

+2 −0
Original line number Diff line number Diff line
@@ -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);