| commit | fba75dbb1d3e82572fc92d61cf4d38b80f2f764a | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Wed Sep 13 21:22:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 21:22:04 2023 +0000 |
| tree | 08129ca7de3c89f68b05338c57517f93cd6535d9 | |
| parent | a461a25ef94f495d1f5eb374413dc8f022ec838d [diff] | |
| parent | 5d85015acd97d5c222264400126d3d815f21afea [diff] |
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>
diff --git a/audio/core/all-versions/default/PrimaryDevice.cpp b/audio/core/all-versions/default/PrimaryDevice.cpp index cf162f1..13efbbc 100644 --- a/audio/core/all-versions/default/PrimaryDevice.cpp +++ b/audio/core/all-versions/default/PrimaryDevice.cpp
@@ -283,7 +283,7 @@ _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);