diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-28 06:01:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-28 06:01:58 +0000 |
commit | 11cdc2be30e9995cf315fee474df0edc36ffc120 (patch) | |
tree | f958e409373581c80914b6bbfd357d77b6b23f63 | |
parent | eb436565989810f098055dc15585112b65e0aff9 (diff) | |
parent | 5fe4d48e3986a391750f97c4f69e3b18b21764e7 (diff) | |
download | wlan-11cdc2be30e9995cf315fee474df0edc36ffc120.tar.gz |
Merge "Do not callback on_subsystem_restart when trigger subsystem restart error" into tm-qpr-dev am: 5fe4d48e39
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/synaptics/wlan/+/18910388
Change-Id: Ifc51958b8363b3e327fbd6901dc59444f5e44dcd
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; |