| commit | 7ccd2acee4eadf16d97736d42112f168c663c140 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Wed Sep 13 19:39:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 19:39:37 2023 +0000 |
| tree | 7aff08fd00952c624316106e236b37b08f3f3c3b | |
| parent | ba3c28f47183293667172c9c5c093efd59094fa0 [diff] | |
| parent | ecc3e1af823704dcedbc22bd6d4dba51ae077e6a [diff] |
Merge "Don't depend on String8 cast to C string [audio]" into main am: ecc3e1af82 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748354 Change-Id: Icd46864cc50f72142d6c2962e84d67f5807420b4 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);