diff options
| author | Sukanya Rajkhowa <srajkh@codeaurora.org> | 2014-09-25 15:47:26 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:20:13 -0600 |
| commit | f2abf7079ada584f14a6cd31d22c33d321af6d3b (patch) | |
| tree | f5341d15cea33e6acf0650e29a01d358dd968bf9 | |
| parent | 1021d9a9da5a47095f6d9085ea341e6015215dc2 (diff) | |
| download | android_hardware_ril-f2abf7079ada584f14a6cd31d22c33d321af6d3b.tar.gz android_hardware_ril-f2abf7079ada584f14a6cd31d22c33d321af6d3b.tar.bz2 android_hardware_ril-f2abf7079ada584f14a6cd31d22c33d321af6d3b.zip | |
Remove support for Data_Call_Response_v6 in RIL versions >=10
Supporting both Ril_Data_Call_Response_v6 and v9 is not feasible
for the same RIL version in scenarios where the length of data call
response list may be a multiple of both structure sizes. Doing
so causes rild to crash.
Change-Id: I2a2666da76e88f60e53c6bae5afd7eb0b9c77435
CRs-Fixed: 716222
| -rw-r--r-- | libril/ril.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libril/ril.cpp b/libril/ril.cpp index 1661d18..9952d44 100644 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -2519,9 +2519,9 @@ static int responseDataCallList(Parcel &p, void *response, size_t responselen) if (s_callbacks.version < 5) { RLOGD("responseDataCallList: v4"); return responseDataCallListV4(p, response, responselen); - } else if (responselen % sizeof(RIL_Data_Call_Response_v6) == 0) { + } else if (s_callbacks.version < 10) { return responseDataCallListV6(p, response, responselen); - } else if (responselen % sizeof(RIL_Data_Call_Response_v9) == 0) { + } else if (s_callbacks.version == 10) { return responseDataCallListV9(p, response, responselen); } else { if (response == NULL && responselen != 0) { |