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

Commit 912bd4bf authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio HAL HIDL wrapper: Fix incorrect conversion of TTY Mode 



The TTYMode enum numeric value was converted to a char* instead of its
literal value and vice versa.

Instead convert it to/from its literal value.
Eg: TTYMode::FULL -> "FULL" instead of "3"
    "FULL" -> 0 as atoi conversion would fail

Test: atest VtsHalAudioV4_0TargetTest
Bug: 71486871
Change-Id: I29bbf6bf3b5532269afcc5d39ea10eff2871bdea
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
Signed-off-by: default avatarJungyee Yoo <jungyee.yoo@lge.corp-partner.google.com>
parent c1d89888

audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ using ::android::hardware::hidl_vec; 


class ParametersUtil {

   public:

    Result setParam(const char* name, const char* value);

    Result getParam(const char* name, bool* value);

    Result getParam(const char* name, int* value);

    Result getParam(const char* name, String8* value, AudioParameter context = {});

audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.impl.h

+6 −0
Original line number Diff line number Diff line
@@ -112,6 +112,12 @@ std::unique_ptr<AudioParameter> ParametersUtil::getParams(const AudioParameter& 
    return std::unique_ptr<AudioParameter>(new AudioParameter(paramsAndValues));

}



Result ParametersUtil::setParam(const char* name, const char* value) {

    AudioParameter param;

    param.add(String8(name), String8(value));

    return setParams(param);

}



Result ParametersUtil::setParam(const char* name, bool value) {

    AudioParameter param;

    param.add(String8(name), String8(value ? AudioParameter::valueOn : AudioParameter::valueOff));

audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h

+44 −4
Original line number Diff line number Diff line
@@ -208,16 +208,56 @@ Return<Result> PrimaryDevice::setBtScoWidebandEnabled(bool enabled) { 
    return mDevice->setParam(AUDIO_PARAMETER_KEY_BT_SCO_WB, enabled);

}



static const char* convertTtyModeFromHIDL(IPrimaryDevice::TtyMode mode) {

    switch (mode) {

        case IPrimaryDevice::TtyMode::OFF:

            return AUDIO_PARAMETER_VALUE_TTY_OFF;

        case IPrimaryDevice::TtyMode::VCO:

            return AUDIO_PARAMETER_VALUE_TTY_VCO;

        case IPrimaryDevice::TtyMode::HCO:

            return AUDIO_PARAMETER_VALUE_TTY_HCO;

        case IPrimaryDevice::TtyMode::FULL:

            return AUDIO_PARAMETER_VALUE_TTY_FULL;

        default:

            return nullptr;

    }

}

static IPrimaryDevice::TtyMode convertTtyModeToHIDL(const char* halMode) {

    if (strcmp(halMode, AUDIO_PARAMETER_VALUE_TTY_OFF) == 0)

        return IPrimaryDevice::TtyMode::OFF;

    else if (strcmp(halMode, AUDIO_PARAMETER_VALUE_TTY_VCO) == 0)

        return IPrimaryDevice::TtyMode::VCO;

    else if (strcmp(halMode, AUDIO_PARAMETER_VALUE_TTY_HCO) == 0)

        return IPrimaryDevice::TtyMode::HCO;

    else if (strcmp(halMode, AUDIO_PARAMETER_VALUE_TTY_FULL) == 0)

        return IPrimaryDevice::TtyMode::FULL;

    return IPrimaryDevice::TtyMode(-1);

}



Return<void> PrimaryDevice::getTtyMode(getTtyMode_cb _hidl_cb) {

    int halMode;

    String8 halMode;

    Result retval = mDevice->getParam(AUDIO_PARAMETER_KEY_TTY_MODE, &halMode);

    TtyMode mode = retval == Result::OK ? TtyMode(halMode) : TtyMode::OFF;

    _hidl_cb(retval, mode);

    if (retval != Result::OK) {

        _hidl_cb(retval, TtyMode::OFF);

        return Void();

    }

    TtyMode mode = convertTtyModeToHIDL(halMode);

    if (mode == TtyMode(-1)) {

        ALOGE("HAL returned invalid TTY value: %s", halMode.c_str());

        _hidl_cb(Result::INVALID_STATE, TtyMode::OFF);

        return Void();

    }

    _hidl_cb(Result::OK, mode);

    return Void();

}



Return<Result> PrimaryDevice::setTtyMode(IPrimaryDevice::TtyMode mode) {

    return mDevice->setParam(AUDIO_PARAMETER_KEY_TTY_MODE, static_cast<int>(mode));

    const char* modeStr = convertTtyModeFromHIDL(mode);

    if (modeStr == nullptr) {

        ALOGW("Can not set an invalid TTY value: %d", mode);

        return Result::INVALID_ARGUMENTS;

    }

    return mDevice->setParam(AUDIO_PARAMETER_KEY_TTY_MODE, modeStr);

}



Return<void> PrimaryDevice::getHacEnabled(getHacEnabled_cb _hidl_cb) {