diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-28 06:29:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-28 06:29:09 +0000 |
| commit | 999d922e76f975e0ca1d7367ca6bc9ecb600afc3 (patch) | |
| tree | f958e409373581c80914b6bbfd357d77b6b23f63 | |
| parent | 86a39c83889653ab91e568fe86b31204ccf0160a (diff) | |
| parent | 11cdc2be30e9995cf315fee474df0edc36ffc120 (diff) | |
| download | wlan-999d922e76f975e0ca1d7367ca6bc9ecb600afc3.tar.gz | |
Merge "Do not callback on_subsystem_restart when trigger subsystem restart error" into tm-qpr-dev am: 5fe4d48e39 am: 11cdc2be30
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/synaptics/wlan/+/18910388
Change-Id: I5b045a5787e8bc0eb077c492d6040150966571ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | synadhd/wifi_hal/wifi_logger.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/synadhd/wifi_hal/wifi_logger.cpp b/synadhd/wifi_hal/wifi_logger.cpp index 5743086..b531838 100755 --- a/synadhd/wifi_hal/wifi_logger.cpp +++ b/synadhd/wifi_hal/wifi_logger.cpp @@ -2063,12 +2063,14 @@ wifi_error wifi_trigger_subsystem_restart(wifi_handle handle) strncpy(error_str, "WIFI_SUCCESS", sizeof(error_str)); exit: - if (info->restart_handler.on_subsystem_restart) { - ALOGI("Trigger ssr handler registered handler:%p", - info->restart_handler.on_subsystem_restart); - (info->restart_handler.on_subsystem_restart)(error_str); - } else { - ALOGI("No trigger ssr handler registered"); + if (result == WIFI_SUCCESS) { + if (info->restart_handler.on_subsystem_restart) { + ALOGI("Trigger ssr handler registered handler:%p", + info->restart_handler.on_subsystem_restart); + (info->restart_handler.on_subsystem_restart)(error_str); + } else { + ALOGI("No trigger ssr handler registered"); + } } return result; |