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

Commit 9bedbbc6 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Don't depend on String8 cast to C string [audio]" into main am:... 

Merge "Don't depend on String8 cast to C string [audio]" into main am: ecc3e1af am: 7ccd2ace am: 5d85015a am: fba75dbb

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



Change-Id: I8bcd792e12aa2992ab8995e619644bd71b1ede3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13648132 fba75dbb

audio/core/all-versions/default/PrimaryDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ Return<void> PrimaryDevice::getTtyMode(getTtyMode_cb _hidl_cb) { 
        _hidl_cb(retval, TtyMode::OFF);

        return Void();

    }

    TtyMode mode = convertTtyModeToHIDL(halMode);

    TtyMode mode = convertTtyModeToHIDL(halMode.c_str());

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

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

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