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