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

Commit a77467d7 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "IFoo: send struct with fmq." am: 7daf2659 

am: e9773dc9

Change-Id: I14d1499b2d34515800b22712515d028340e649a9
parents 4dc8ab40 e9773dc9

tests/bar/1.0/default/Bar.cpp

+4 −0
Original line number Diff line number Diff line
@@ -149,6 +149,10 @@ Return<void> Bar::closeHandles() { 
    return mFoo->closeHandles();

}



Return<void> Bar::repeatWithFmq(const IFoo::WithFmq& withFmq, repeatWithFmq_cb _hidl_cb) {

    return mFoo->repeatWithFmq(withFmq, _hidl_cb);

}



Return<void> Bar::echoNullInterface(const sp<IFooCallback> &cb, echoNullInterface_cb _hidl_cb) {

    return mFoo->echoNullInterface(cb, _hidl_cb);

}

tests/bar/1.0/default/Bar.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ struct Bar : public IBar { 
    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;

    virtual Return<void> repeatWithFmq(const IFoo::WithFmq& withFmq,

                                       repeatWithFmq_cb _hidl_cb) override;



    Return<void> haveAVectorOfInterfaces(

            const hidl_vec<sp<ISimple> > &in,

tests/foo/1.0/IFoo.hal

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,10 @@ interface IFoo { 
        bitfield<BitField> bf;

    };



    struct WithFmq {

        fmq_sync<uint8_t> descSync;

    };



    enum Discriminator : uint8_t {

        BOOL,

        INT,
@@ -204,4 +208,6 @@ interface IFoo { 
    createMyHandle() generates (MyHandle h);

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

    closeHandles();



    repeatWithFmq(WithFmq withFmq) generates (WithFmq withFmq);

};

tests/foo/1.0/default/Foo.cpp

+5 −0
Original line number Diff line number Diff line
@@ -379,6 +379,11 @@ Return<void> Foo::echoNullInterface(const sp<IFooCallback> &cb, echoNullInterfac 
    return Void();

}



Return<void> Foo::repeatWithFmq(const IFoo::WithFmq& withFmq, repeatWithFmq_cb _hidl_cb) {

    _hidl_cb(withFmq);

    return Void();

}



IFoo* HIDL_FETCH_IFoo(const char* /* name */) {

    return new Foo();

}

tests/foo/1.0/default/Foo.h

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ struct Foo : public IFoo { 
    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;

    virtual Return<void> repeatWithFmq(const IFoo::WithFmq& withFmq,

                                       repeatWithFmq_cb _hidl_cb) override;



    Return<void> haveAVectorOfInterfaces(

            const hidl_vec<sp<ISimple> > &in,
@@ -63,6 +65,7 @@ struct Foo : public IFoo { 
            haveAVectorOfGenericInterfaces_cb _hidl_cb) override;



    Return<void> echoNullInterface(const sp<IFooCallback> &cb, echoNullInterface_cb _hidl_cb) override;



private:

    std::vector<::native_handle_t *> mHandles;

};