wifi(implementation): Add null checks for RTT result

According to the legacy HAL header file, the LCI & LCR fields may not
always be populated. So, add null checks for them.

Bug: 36141536
Test: Compiles
Change-Id: Id2a5f5fd0eaf21b3a4d5cfcd26124c9fb6c90869
This commit is contained in:
Roshan Pius
2017-03-10 21:12:11 -08:00
parent 4f4fdaf664
commit 78cfef9f0c

View File

@@ -1898,10 +1898,12 @@ bool convertLegacyRttResultToHidl(
hidl_result->timeStampInUs = legacy_result.ts;
hidl_result->burstDurationInMs = legacy_result.burst_duration;
hidl_result->negotiatedBurstNum = legacy_result.negotiated_burst_num;
if (!convertLegacyIeToHidl(*legacy_result.LCI, &hidl_result->lci)) {
if (legacy_result.LCI && !convertLegacyIeToHidl(*legacy_result.LCI,
&hidl_result->lci)) {
return false;
}
if (!convertLegacyIeToHidl(*legacy_result.LCR, &hidl_result->lcr)) {
if (legacy_result.LCR && !convertLegacyIeToHidl(*legacy_result.LCR,
&hidl_result->lcr)) {
return false;
}
return true;