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

Commit ebfa6331 authored by Yifan Hong's avatar Yifan Hong Committed by Martijn Coenen
Browse files

Add interface methods for testing vec<handle>. 

Test: hidl_test
Bug: 32160974
Change-Id: I7eda1650fcf8d58778b2aad97a5bd62afc95bc36
parent 058ee272

tests/bar/1.0/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ cc_library_shared { 


    shared_libs: [

        "libbase",

        "libcutils",

        "libhidl",

        "libhwbinder",

        "liblog",

tests/bar/1.0/default/Bar.cpp

+12 −0
Original line number Diff line number Diff line
@@ -130,6 +130,18 @@ Return<void> Bar::haveAVectorOfGenericInterfaces( 
    return Void();

}



Return<void> Bar::createMyHandle(createMyHandle_cb _hidl_cb) {

    return mFoo->createMyHandle(_hidl_cb);

}



Return<void> Bar::createHandles(uint32_t size, createHandles_cb _hidl_cb) {

    return mFoo->createHandles(size, _hidl_cb);

}



Return<void> Bar::closeHandles() {

    return mFoo->closeHandles();

}



// Methods from ::android::hardware::tests::bar::V1_0::IBar follow.

Return<void> Bar::thisIsNew()  {

    ALOGI("SERVER(Bar) thisIsNew");

tests/bar/1.0/default/Bar.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ struct Bar : public IBar { 
    virtual Return<void> transpose2(const hidl_array<hidl_string, 5 /* 5 */, 3 /* 3 */>& in, transpose2_cb _hidl_cb)  override;

    virtual Return<void> sendVec(const hidl_vec<uint8_t>& data, sendVec_cb _hidl_cb)  override;

    virtual Return<void> sendVecVec(sendVecVec_cb _hidl_cb)  override;

    virtual Return<void> createMyHandle(createMyHandle_cb _hidl_cb)  override;

    virtual Return<void> createHandles(uint32_t size, createHandles_cb _hidl_cb)  override;

    virtual Return<void> closeHandles()  override;



    Return<void> haveAVectorOfInterfaces(

            const hidl_vec<sp<ISimple> > &in,

tests/foo/1.0/IFoo.hal

+8 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ interface IFoo { 
        FloatArray myFloatArray;

    };



    struct MyHandle {

        handle h;

        int32_t guard;

    };



    doThis(float param);

    doThatAndReturnSomething(int64_t param) generates (int32_t result);

    doQuiteABit(int32_t a, int64_t b, float c, double d) generates (double something);
@@ -112,4 +117,7 @@ interface IFoo { 


    haveAVectorOfGenericInterfaces(vec<interface> in)

        generates (vec<interface> out);

    createMyHandle() generates (MyHandle h);

    createHandles(uint32_t size) generates (vec<handle> handles);

    closeHandles();

};

tests/foo/1.0/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ cc_library_shared { 


    shared_libs: [

        "libbase",

        "libcutils",

        "libhidl",

        "libfootest",

        "libhwbinder",