diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-12 05:16:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-12 05:16:34 +0000 |
commit | c9b0df94ddda5929868a1c86e6819aa3370988e3 (patch) | |
tree | 6559c45edbe0848d160294f43ad3df0e693faf6c /wifi/1.4 | |
parent | 82d94bd6018f2dc7a63791bc8c411d165f3e333e (diff) | |
parent | f4b2a450560449655b46dd0e142ffdd30412fb20 (diff) | |
download | platform_hardware_interfaces-c9b0df94ddda5929868a1c86e6819aa3370988e3.tar.gz platform_hardware_interfaces-c9b0df94ddda5929868a1c86e6819aa3370988e3.tar.bz2 platform_hardware_interfaces-c9b0df94ddda5929868a1c86e6819aa3370988e3.zip |
Merge "wifi: Update wifi_wait_for_driver_ready return status handling" into rvc-qpr-dev am: f4b2a45056
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12124823
Change-Id: Ibe9edd99b964e6d7d560ac25938b36725a4c8a32
Diffstat (limited to 'wifi/1.4')
-rw-r--r-- | wifi/1.4/default/wifi_legacy_hal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/1.4/default/wifi_legacy_hal.cpp b/wifi/1.4/default/wifi_legacy_hal.cpp index 29123bfe47..75f22ec3ea 100644 --- a/wifi/1.4/default/wifi_legacy_hal.cpp +++ b/wifi/1.4/default/wifi_legacy_hal.cpp @@ -367,8 +367,8 @@ wifi_error WifiLegacyHal::start() { } LOG(DEBUG) << "Waiting for the driver ready"; wifi_error status = global_func_table_.wifi_wait_for_driver_ready(); - if (status == WIFI_ERROR_TIMED_OUT) { - LOG(ERROR) << "Timed out awaiting driver ready"; + if (status == WIFI_ERROR_TIMED_OUT || status == WIFI_ERROR_UNKNOWN) { + LOG(ERROR) << "Failed or timed out awaiting driver ready"; return status; } property_set(kDriverPropName, "ok"); |