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

Commit 932c93f5 authored by Howard Chen's avatar Howard Chen Committed by android-build-merger
Browse files

Merge "Add a test method to test interface in struct" 

am: c0204ee1

Change-Id: I0340f31c48036cc1baf0fdbecaa96877af739063
parents 6d06a6f7 c0204ee1

tests/baz/1.0/IBaz.hal

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ interface IBaz extends IBase { 
        bitfield<BitField> bf;

    };



    struct StructWithInterface {

        int32_t number;

        IBase dummy;

    };

    oneway doThis(float param);



    doThatAndReturnSomething(int64_t param) generates (int32_t result);
@@ -93,4 +97,6 @@ interface IBaz extends IBase { 
    size(uint32_t size) generates (uint32_t size);



    getNestedStructs() generates(vec<NestedStruct> data);



    haveSomeStructWithInterface(StructWithInterface swi) generates(StructWithInterface swi);

};

tests/baz/1.0/default/Baz.cpp

+6 −0
Original line number Diff line number Diff line
@@ -394,6 +394,12 @@ Return<void> Baz::getNestedStructs(getNestedStructs_cb _hidl_cb) { 
    _hidl_cb(result);

    return Void();

}



Return<void> Baz::haveSomeStructWithInterface(const StructWithInterface& swi,

                                              haveSomeStructWithInterface_cb _hidl_cb) {

    _hidl_cb(swi);

    return Void();

}

// Methods from ::android::hidl::base::V1_0::IBase follow.



IBaz* HIDL_FETCH_IBaz(const char* /* name */) {

tests/baz/1.0/default/Baz.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ struct Baz : public IBaz { 
    Return<uint32_t> size(uint32_t size) override;

    Return<void> getNestedStructs(getNestedStructs_cb _hidl_cb) override;



    Return<void> haveSomeStructWithInterface(const StructWithInterface& swi,

                                             haveSomeStructWithInterface_cb _hidl_cb) override;

    // Methods from ::android::hidl::base::V1_0::IBase follow.

 private:

    sp<IBazCallback> mStoredCallback;