diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-09-28 19:40:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-28 19:40:33 +0000 |
| commit | d73cd8e333aeb36568fc5e438813956eab80c238 (patch) | |
| tree | e85a39a8d72b962035b725bf8e947c6119c82cac | |
| parent | 0e118c00b0ae46e0912f2cd3af7cae93121d624d (diff) | |
| parent | 028dc65e7bba4e0d1ea6c1ea83e508248f91434a (diff) | |
| download | wlan-d73cd8e333aeb36568fc5e438813956eab80c238.tar.gz | |
Merge "Don't depend on String8 cast to C string" into main am: 028dc65e7btmp_amf_298295554
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2749247
Change-Id: I4fbce4e13f0c319d55493ec97db4856af4bccb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | bcmdhd/wifi_hal/rtt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp index 819364a..2197c81 100644 --- a/bcmdhd/wifi_hal/rtt.cpp +++ b/bcmdhd/wifi_hal/rtt.cpp @@ -134,7 +134,7 @@ get_err_info(int status) for (i = 0; i < (int) num_entries; i++) { if (p_entry->id == status) - return p_entry->text; + return p_entry->text.c_str(); p_entry++; /* next entry */ } return "unknown error"; /* not found */ |