diff options
author | Xin Li <delphij@google.com> | 2023-12-09 00:11:56 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-09 00:11:56 +0000 |
commit | 989e4c781713d6b496156c0761a400a7d335c150 (patch) | |
tree | 5aa9d37e9aed96c8a3e8dd70bb8767d74f3a0329 | |
parent | 24412146aeba2d7a7a23bbbdda4f092f84ad4d91 (diff) | |
parent | d139286a6b65267e7b226d28c4fa3d1738293e28 (diff) | |
download | wlan-989e4c781713d6b496156c0761a400a7d335c150.tar.gz |
Merge "Merge Android 14 QPR1" into main
-rw-r--r-- | wcn6740/qcwcn/wifi_hal/rtt.cpp | 2 | ||||
-rw-r--r-- | wcn6740/qcwcn/wifi_hal/wificonfig.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wcn6740/qcwcn/wifi_hal/rtt.cpp b/wcn6740/qcwcn/wifi_hal/rtt.cpp index 291f057..4671d52 100644 --- a/wcn6740/qcwcn/wifi_hal/rtt.cpp +++ b/wcn6740/qcwcn/wifi_hal/rtt.cpp @@ -121,7 +121,7 @@ wifi_error wifi_rtt_range_request(wifi_request_id id, return WIFI_ERROR_INVALID_ARGS; } - if (handler.on_rtt_results == NULL) { + if (handler.on_rtt_results == NULL && handler.on_rtt_results_v2 == NULL ) { ALOGE("wifi_rtt_range_request: NULL capabilities pointer provided." " Exit."); return WIFI_ERROR_INVALID_ARGS; diff --git a/wcn6740/qcwcn/wifi_hal/wificonfig.cpp b/wcn6740/qcwcn/wifi_hal/wificonfig.cpp index 5aec138..3217c72 100644 --- a/wcn6740/qcwcn/wifi_hal/wificonfig.cpp +++ b/wcn6740/qcwcn/wifi_hal/wificonfig.cpp @@ -1216,7 +1216,7 @@ wifi_error wifi_set_latency_mode(wifi_interface_handle iface, level = QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_NORMAL; break; case WIFI_LATENCY_MODE_LOW: - level = QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_ULTRALOW; + level = QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_LOW; break; default: ALOGI("%s: Unsupported latency mode=%d, resetting to NORMAL!", __FUNCTION__, mode); |