diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-31 01:06:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-31 01:06:30 +0000 |
| commit | 84f4c42860bec1caaea629e52a2f384c74338562 (patch) | |
| tree | 1ebdbe9e6cd392501b3d48e1244fb792996b3391 | |
| parent | 32962da02f0a93c1ba0fc13939771decd6ee0a04 (diff) | |
| parent | ac1155b19ceff5cb7720fd4f19e23d6a78abdd3b (diff) | |
| download | wlan-84f4c42860bec1caaea629e52a2f384c74338562.tar.gz | |
Snap for 7599705 from ac1155b19ceff5cb7720fd4f19e23d6a78abdd3b to sc-d2-release
Change-Id: I7599579349058563adf2c9a832c783e37daf3e80
| -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; } |