Change mock-ril and reference-ril to use include/telephony/ril.h
I've done this by change the copy to a symbolic link, this allows
us to easily change from using the common include/telephony/ril.h
to a separate instance when ril.h is evolving.
Bug: 3457628
Bug: 4132203
Change-Id: Idd8029e57dd0b2afc16c2659dbbc3e587b438f0a
diff --git a/libril/ril.cpp b/libril/ril.cpp
index b78bda0..69ce52e 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -2085,12 +2085,7 @@
return RIL_ERRNO_INVALID_RESPONSE;
}
- if (responselen != sizeof (RIL_CardStatus_v6 *)) {
- LOGE("responseSimStatus: Expecting pointer\n");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (s_callbacks.version == 6) {
+ if (responselen == sizeof (RIL_CardStatus_v6)) {
RIL_CardStatus_v6 *p_cur = ((RIL_CardStatus_v6 *) response);
p.writeInt32(p_cur->card_state);
@@ -2100,7 +2095,7 @@
p.writeInt32(p_cur->ims_subscription_app_index);
sendSimStatusAppInfo(p, p_cur->num_applications, p_cur->applications);
- } else {
+ } else if (responselen == sizeof (RIL_CardStatus_v5)) {
RIL_CardStatus_v5 *p_cur = ((RIL_CardStatus_v5 *) response);
p.writeInt32(p_cur->card_state);
@@ -2110,6 +2105,9 @@
p.writeInt32(-1);
sendSimStatusAppInfo(p, p_cur->num_applications, p_cur->applications);
+ } else {
+ LOGE("responseSimStatus: A RilCardStatus_v6 or _v5 expected\n");
+ return RIL_ERRNO_INVALID_RESPONSE;
}
return 0;