summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSukanya Rajkhowa <srajkh@codeaurora.org>2014-09-25 15:47:26 -0700
committerSteve Kondik <steve@cyngn.com>2014-11-27 00:39:32 -0800
commitdc298d8bec178ea505ae03019596b8bdc04d02d1 (patch)
tree42dc84feea13188cd732caf0d9923e4539117d0d
parent6b8df8dfc6da337ca53e67a5a6f114b49bbb9373 (diff)
downloadandroid_hardware_ril-dc298d8bec178ea505ae03019596b8bdc04d02d1.tar.gz
android_hardware_ril-dc298d8bec178ea505ae03019596b8bdc04d02d1.tar.bz2
android_hardware_ril-dc298d8bec178ea505ae03019596b8bdc04d02d1.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
-rwxr-xr-xlibril/ril.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libril/ril.cpp b/libril/ril.cpp
index 7520d97..6304e84 100755
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -2348,8 +2348,8 @@ static int responseDataCallList(Parcel &p, void *response, size_t responselen)
return RIL_ERRNO_INVALID_RESPONSE;
}
- // Support v6 or v9 with new rils
- if (responselen % sizeof(RIL_Data_Call_Response_v6) == 0) {
+ // Support v6 only in ril version < 10
+ if (s_callbacks.version < 10) {
RLOGD("responseDataCallList: v6");
return responseDataCallListV6(p, response, responselen);
}