diff options
| author | Ajay Davanageri <ajay.davanageri@broadcom.corp-partner.google.com> | 2023-04-06 01:38:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-06 01:38:27 +0000 |
| commit | 68236de9ae117f14b8068684e90a056cb478cbb3 (patch) | |
| tree | ce3b69bd7685c85cab2f9ec566c8e9cc4740289b | |
| parent | 991b9c6a8a9b5528c8db309bfd9ae28384803694 (diff) | |
| parent | 21e159afa782a11c269e8ca8e5c12826af05ac21 (diff) | |
| download | wlan-68236de9ae117f14b8068684e90a056cb478cbb3.tar.gz | |
Updating the vendor hal with new rtt result struct am: 21e159afa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/22410646
Change-Id: Ie0f2d8e31c0fe26132d2ef002f5c0ba278ace4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | bcmdhd/wifi_hal/rtt.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp index 202fb33..819364a 100644 --- a/bcmdhd/wifi_hal/rtt.cpp +++ b/bcmdhd/wifi_hal/rtt.cpp @@ -577,7 +577,7 @@ public: } else if (it2.get_type() == RTT_ATTRIBUTE_RESULT_FREQ) { channel = it2.get_u32(); if (rttResults[currentIdx] == NULL) { - ALOGE("Not allocated\n"); + ALOGE("Not allocated, currentIdx %d\n", currentIdx); break; } if (!channel) { @@ -590,7 +590,7 @@ public: } else if (it2.get_type() == RTT_ATTRIBUTE_RESULT_BW) { bw = (wifi_rtt_bw)it2.get_u32(); if (rttResults[currentIdx] == NULL) { - ALOGE("Not allocated\n"); + ALOGE("Not allocated, currentIdx %d\n", currentIdx); break; } rttResults[currentIdx]->packet_bw = bw; @@ -665,7 +665,7 @@ public: memcpy(&rtt_result_v2->rtt_result, (wifi_rtt_result *)rtt_results_v1, RTT_RESULT_V1_SIZE); if (!channel) { - rtt_result_v2->frequency = WIFI_CHAN_WIDTH_INVALID; + rtt_result_v2->frequency = UNSPECIFIED; } /* Copy the optional data to new struct */ @@ -706,7 +706,8 @@ public: rtt_results_v1->distance_mm / 10, rtt_results_v1->burst_duration, rtt_results_v1->negotiated_burst_num); - nextidx = currentIdx++; + nextidx = currentIdx; + nextidx++; } } } |