diff options
| author | Ajay <ajay.davanageri@broadcom.com> | 2021-07-28 12:12:38 +0530 |
|---|---|---|
| committer | Roger Wang <wangroger@google.com> | 2021-07-30 16:44:45 +0800 |
| commit | 4496dc7b6d7280f1c9d0459f57685c80a2265240 (patch) | |
| tree | 1ebdbe9e6cd392501b3d48e1244fb792996b3391 | |
| parent | f60d123f56422b455466fabfc9e6b9c512b75fe7 (diff) | |
| download | wlan-4496dc7b6d7280f1c9d0459f57685c80a2265240.tar.gz | |
Early register of RTT,GSCAN and PNO event.
Bug: 194813290
Test: Verified on hikey960 platform.
Change-Id: I6a726738e2250d4ad0b9078d0827478695962e98
| -rwxr-xr-x | bcmdhd/wifi_hal/gscan.cpp | 20 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/rtt.cpp | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 84b74b2..f012423 100755 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -575,6 +575,10 @@ public: return result; } + registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE); + registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN); + registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_FULL_SCAN_RESULTS); + result = requestResponse(request); if (result != WIFI_SUCCESS) { ALOGE("failed to configure setup; result = %d", result); @@ -603,10 +607,6 @@ public: return result; } - registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE); - registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN); - registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_FULL_SCAN_RESULTS); - result = requestResponse(request); if (result != WIFI_SUCCESS) { ALOGE("failed to start scan; result = %d", result); @@ -1065,6 +1065,9 @@ public: return result; } + registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND); + registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_LOST); + result = requestResponse(request); if (result < 0) { ALOGI("Failed to execute hotlist setup request, result = %d", result); @@ -1079,9 +1082,6 @@ public: return result; } - registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND); - registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_LOST); - result = requestResponse(request); if (result < 0) { unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND); @@ -1285,6 +1285,7 @@ public: return result; } + registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_EPNO_EVENT); result = requestResponse(request); if (result < 0) { ALOGI("Failed to execute ePNO setup request, result = %d", result); @@ -1293,7 +1294,6 @@ public: } ALOGI("Successfully set %d SSIDs for ePNO", epno_params.num_networks); - registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_EPNO_EVENT); ALOGI("successfully restarted the scan"); return result; } @@ -1492,6 +1492,8 @@ public: return result; } + registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SIGNIFICANT_CHANGE_RESULTS); + result = requestResponse(request); if (result < 0) { ALOGI("failed to set significant wifi change config %d", result); @@ -1505,8 +1507,6 @@ public: return result; } - registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SIGNIFICANT_CHANGE_RESULTS); - result = requestResponse(request); if (result < 0) { unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SIGNIFICANT_CHANGE_RESULTS); diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp index 97616a0..43a49e8 100644 --- a/bcmdhd/wifi_hal/rtt.cpp +++ b/bcmdhd/wifi_hal/rtt.cpp @@ -485,13 +485,13 @@ public: return result; } + registerVendorHandler(GOOGLE_OUI, RTT_EVENT_COMPLETE); result = requestResponse(request); if (result != WIFI_SUCCESS) { ALOGE("failed to configure RTT setup; result = %d", result); return result; } - registerVendorHandler(GOOGLE_OUI, RTT_EVENT_COMPLETE); ALOGI("Successfully started RTT operation"); return result; } |