commit d139286a6b65267e7b226d28c4fa3d1738293e28
author Xin Li <delphij@google.com> Fri Dec 08 13:14:16 2023 -0800
committer Xin Li <delphij@google.com> Fri Dec 08 13:14:16 2023 -0800
tree 5aa9d37e9aed96c8a3e8dd70bb8767d74f3a0329
parent 24412146aeba2d7a7a23bbbdda4f092f84ad4d91
parent 6449edca352b804dde29aa1e8b96dd39180fe844

Merge Android 14 QPR1

Merged-In: I808dfb87fcc7e2a7e7e7353e911e531c960f6cac
Bug: 315507370
Change-Id: I73b6f23f95124e580a247ef1aa36d4c67e63ac91

wcn6740/qcwcn/wifi_hal/rtt.cpp

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 @@
         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;

wcn6740/qcwcn/wifi_hal/wificonfig.cpp

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 @@
         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);