summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2014-10-08 15:29:53 +0100
committerRicardo Cerqueira <ricardo@cyngn.com>2014-10-08 15:34:26 +0100
commit5d760e3c46e26e7f6e36d00373ff67f76ce16c50 (patch)
tree41a7019aafa239bc49b83956e1ab5acc1cc0f539
parentc832b022eea69c219aa9f2d5fc8cbffd73f12c6f (diff)
downloadandroid_hardware_ril-5d760e3c46e26e7f6e36d00373ff67f76ce16c50.tar.gz
android_hardware_ril-5d760e3c46e26e7f6e36d00373ff67f76ce16c50.tar.bz2
android_hardware_ril-5d760e3c46e26e7f6e36d00373ff67f76ce16c50.zip
rild: Unbreak multi-SIM socket name
Change-Id: Icae742c42c45726105d1a9e07a26bc4d10cc82bf
-rw-r--r--rild/rild.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/rild/rild.c b/rild/rild.c
index 20fd3c7..a7deb45 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -47,6 +47,10 @@ static void usage(const char *argv0)
exit(EXIT_FAILURE);
}
+#ifdef QCOM_HARDWARE
+extern char rild[MAX_SOCKET_NAME_LENGTH];
+#endif
+
extern void RIL_register (const RIL_RadioFunctions *callbacks);
extern void RIL_onRequestComplete(RIL_Token t, RIL_Errno e,
@@ -152,7 +156,7 @@ int main(int argc, char **argv)
}
if (strncmp(clientId, "0", MAX_CLIENT_ID_LENGTH)) {
if (RIL_setRilSocketName) {
- RIL_setRilSocketName(clientId);
+ RIL_setRilSocketName(strncat(rild, clientId, MAX_SOCKET_NAME_LENGTH));
} else {
RLOGE("Trying to instantiate multiple rild sockets without a compatible libril!");
}