diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-09-28 20:46:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-28 20:46:14 +0000 |
| commit | 619fd103d1b661fc02e4284515e71b9be900af50 (patch) | |
| tree | 98ca08ff22c76b8b6fbe7ac097a39606edf800b5 | |
| parent | 2266a6f802f869ef6d4eda299434834828a1d166 (diff) | |
| parent | d73cd8e333aeb36568fc5e438813956eab80c238 (diff) | |
| download | wlan-619fd103d1b661fc02e4284515e71b9be900af50.tar.gz | |
Merge "Don't depend on String8 cast to C string" into main am: 028dc65e7b am: d73cd8e333
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2749247
Change-Id: Iaa97a34db8e4b26b404b95ca2730c888e075af3c
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 */ |