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

Commit 1f1368cf authored by Raj Goparaju's avatar Raj Goparaju Committed by Automerger Merge Worker
Browse files

Merge "AudioControl: add version check for module change callback APIs" into udc-dev am: a5f92772 

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



Change-Id: I9cc6e2939500d9170548d9c46c2b498aa38ca279
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f50570b a5f92772

automotive/audiocontrol/aidl/vts/VtsHalAudioControlTargetTest.cpp

+18 −0
Original line number Original line Diff line number Diff line
@@ -53,17 +53,25 @@ using namespace android::audio::policy::configuration::V7_0; 
namespace audiohalcommon = android::hardware::audio::common;

namespace audiohalcommon = android::hardware::audio::common;

namespace audiomediacommon = android::media::audio::common;

namespace audiomediacommon = android::media::audio::common;





namespace {

constexpr int32_t kAidlVersionThree = 3;

}



class AudioControlAidl : public testing::TestWithParam<std::string> {

class AudioControlAidl : public testing::TestWithParam<std::string> {

  public:

  public:

    virtual void SetUp() override {

    virtual void SetUp() override {

        audioControl = android::waitForDeclaredService<IAudioControl>(String16(GetParam().c_str()));

        audioControl = android::waitForDeclaredService<IAudioControl>(String16(GetParam().c_str()));

        ASSERT_NE(audioControl, nullptr);

        ASSERT_NE(audioControl, nullptr);

        aidlVersion = audioControl->getInterfaceVersion();

    }

    }





    void TearDown() override { audioControl = nullptr; }

    void TearDown() override { audioControl = nullptr; }





    bool isAidlVersionAtleast(int version) const { return aidlVersion >= version; }



    sp<IAudioControl> audioControl;

    sp<IAudioControl> audioControl;

    int32_t capabilities;

    int32_t capabilities;

    int32_t aidlVersion;

};

};





TEST_P(AudioControlAidl, OnSetFadeTowardsFront) {

TEST_P(AudioControlAidl, OnSetFadeTowardsFront) {
@@ -250,6 +258,11 @@ struct ModuleChangeCallbackMock : BnModuleChangeCallback { 




TEST_P(AudioControlAidl, RegisterModuleChangeCallbackTwiceThrowsException) {

TEST_P(AudioControlAidl, RegisterModuleChangeCallbackTwiceThrowsException) {

    ALOGI("Register Module change callback test");

    ALOGI("Register Module change callback test");

    if (!isAidlVersionAtleast(kAidlVersionThree)) {

        GTEST_SKIP() << "Device does not support the new APIs for module change callback";

        return;

    }



    // make sure no stale callbacks.

    // make sure no stale callbacks.

    audioControl->clearModuleChangeCallback();

    audioControl->clearModuleChangeCallback();
@@ -269,6 +282,11 @@ TEST_P(AudioControlAidl, RegisterModuleChangeCallbackTwiceThrowsException) { 




TEST_P(AudioControlAidl, RegisterModuleChangeNullCallbackThrowsException) {

TEST_P(AudioControlAidl, RegisterModuleChangeNullCallbackThrowsException) {

    ALOGI("Register Module change callback with nullptr test");

    ALOGI("Register Module change callback with nullptr test");

    if (!isAidlVersionAtleast(kAidlVersionThree)) {

        GTEST_SKIP() << "Device does not support the new APIs for module change callback";

        return;

    }



    auto status = audioControl->setModuleChangeCallback(nullptr);

    auto status = audioControl->setModuleChangeCallback(nullptr);

    EXPECT_THAT(status.exceptionCode(),

    EXPECT_THAT(status.exceptionCode(),

                AnyOf(Eq(Status::EX_ILLEGAL_ARGUMENT), Eq(Status::EX_UNSUPPORTED_OPERATION)));

                AnyOf(Eq(Status::EX_ILLEGAL_ARGUMENT), Eq(Status::EX_UNSUPPORTED_OPERATION)));