Merge "Don't depend on String8 cast to C string [audio]" into main am: ecc3e1af82 am: 7ccd2acee4 am: 5d85015acd

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

Change-Id: I5de42826a541a15d602bfcc136ad8f382d9fe13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tomasz Wasilczyk
2023-09-13 21:22:04 +00:00
committed by Automerger Merge Worker

View File

@@ -283,7 +283,7 @@ Return<void> PrimaryDevice::getTtyMode(getTtyMode_cb _hidl_cb) {
_hidl_cb(retval, TtyMode::OFF); _hidl_cb(retval, TtyMode::OFF);
return Void(); return Void();
} }
TtyMode mode = convertTtyModeToHIDL(halMode); TtyMode mode = convertTtyModeToHIDL(halMode.c_str());
if (mode == TtyMode(-1)) { if (mode == TtyMode(-1)) {
ALOGE("HAL returned invalid TTY value: %s", halMode.c_str()); ALOGE("HAL returned invalid TTY value: %s", halMode.c_str());
_hidl_cb(Result::INVALID_STATE, TtyMode::OFF); _hidl_cb(Result::INVALID_STATE, TtyMode::OFF);