[Bugfix][API-1299][network] in 3g lynq_solicited_signal_strength fail
Affected branch: unknown
Affected module: unknown
Is it affected on both ZXIC and MTK: mtk and zxic both
Self-test: Yes
Doc Update: No
Change-Id: I015f88ed0f0c9443f70cca59bce640e19cd67f72
diff --git a/common_src/framework/lynq-ril-service/src/ril.cpp b/common_src/framework/lynq-ril-service/src/ril.cpp
index bf24c67..90a842a 100755
--- a/common_src/framework/lynq-ril-service/src/ril.cpp
+++ b/common_src/framework/lynq-ril-service/src/ril.cpp
@@ -2624,7 +2624,7 @@
str[i] = (char)(c + n%90); //encode
}
else
- { //After encoding, the space beyond the end reaches ‘z’, and the cycle starts from the beginning.
+ { //After encoding, the space beyond the end reaches 'z', and the cycle starts from the beginning.
str[i] = (char)(c + n%90 - 90);//encode
}
}
@@ -2654,7 +2654,7 @@
}
else
{
- //After decoding, there are over spaces until ‘z’, and the lowercase letters are processed into printable information by looping
+ //After decoding, there are over spaces until ''z', and the lowercase letters are processed into printable information by looping
str[i] = (char)(c - n%90 + 90); //decode
}
}
@@ -2998,12 +2998,19 @@
p.writeInt32(p_cur->WCDMA_SignalStrength.rscp);
p.writeInt32(p_cur->WCDMA_SignalStrength.ecno);
#ifdef TELEMATIC_5G_SUPPORT
- p.writeInt32(p_cur->NR_SignalStrength.ssRsrp);
- p.writeInt32(p_cur->NR_SignalStrength.ssRsrq);
- p.writeInt32(p_cur->NR_SignalStrength.ssSinr);
- p.writeInt32(p_cur->NR_SignalStrength.csiRsrp);
- p.writeInt32(p_cur->NR_SignalStrength.csiRsrq);
- p.writeInt32(p_cur->NR_SignalStrength.csiSinr);
+ if(responselen >= sizeof (RIL_SignalStrength_v14))
+ {
+ p.writeInt32(p_cur->NR_SignalStrength.ssRsrp);
+ p.writeInt32(p_cur->NR_SignalStrength.ssRsrq);
+ p.writeInt32(p_cur->NR_SignalStrength.ssSinr);
+ p.writeInt32(p_cur->NR_SignalStrength.csiRsrp);
+ p.writeInt32(p_cur->NR_SignalStrength.csiRsrq);
+ p.writeInt32(p_cur->NR_SignalStrength.csiSinr);
+ }
+ else
+ {
+ memset(&(p_cur->NR_SignalStrength), 0, sizeof(p_cur->NR_SignalStrength));
+ }
#endif
startResponse;