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

Commit 7196928c authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "tests.baz@1.0: changes for symmetric tests" am: a9f24023 am:... 

Merge "tests.baz@1.0: changes for symmetric tests" am: a9f24023 am: 295bf122 am: a8d0e57c am: 959fe928

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1438391

Change-Id: I3ce490dddc9114dc09074b233cc5d3b324ec7cb9
parents dfc474c1 959fe928

tests/baz/1.0/IBase.hal

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ interface IBase { 
        DoubleThreeDim double3;

    };



    isJava() generates (bool isJava);



    someBaseMethod();



    someBoolMethod(bool x) generates (bool y);

tests/baz/1.0/default/Baz.cpp

+7 −1
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ Return<void> BazCallback::hey() { 
}



// Methods from ::android::hardware::tests::baz::V1_0::IBase follow.

Return<bool> Baz::isJava() {

    LOG(INFO) << "Baz::isJava";



    return false;

}



Return<void> Baz::someBaseMethod() {

    LOG(INFO) << "Baz::someBaseMethod";
@@ -331,7 +337,7 @@ Return<void> Baz::dieNow() { 
Return<IBaz::SomeEnum> Baz::useAnEnum(IBaz::SomeEnum zzz) {

    LOG(INFO) << "useAnEnum " << (int)zzz;



    return SomeEnum::goober;

    return SomeEnum::quux;

}



Return<void> Baz::haveSomeStrings(const hidl_array<hidl_string, 3>& array,

tests/baz/1.0/default/Baz.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ using ::android::sp; 


struct Baz : public IBaz {

    // Methods from ::android::hardware::tests::baz::V1_0::IBase follow.

    Return<bool> isJava() override;

    Return<void> someBaseMethod() override;

    Return<bool> someBoolMethod(bool x) override;

    Return<void> someBoolArrayMethod(const hidl_array<bool, 3>& x,