diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2017-03-28 11:17:55 -0700 |
|---|---|---|
| committer | Amit Mahajan <amitmahajan@google.com> | 2017-04-04 15:41:27 -0700 |
| commit | 35e9310a95df4fad4457d3cc91638bcae64fa415 (patch) | |
| tree | 0fcd7b9d7dcb6e7b0fd6896fd0b48c0f430c51c6 /rild | |
| parent | c7aaac2316b2d9a4e3a472b05156997778b63164 (diff) | |
| download | android_hardware_ril-35e9310a95df4fad4457d3cc91638bcae64fa415.tar.gz android_hardware_ril-35e9310a95df4fad4457d3cc91638bcae64fa415.tar.bz2 android_hardware_ril-35e9310a95df4fad4457d3cc91638bcae64fa415.zip | |
Change radio related service names to slot1, slot2, slot3...
Test: Basic telephony sanity
Bug: 36570718
Merged-in: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Diffstat (limited to 'rild')
| -rw-r--r-- | rild/rild.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rild/rild.c b/rild/rild.c index 0ce9eaf..4c28fc0 100644 --- a/rild/rild.c +++ b/rild/rild.c @@ -46,7 +46,8 @@ static void usage(const char *argv0) { exit(EXIT_FAILURE); } -extern char rild[MAX_SOCKET_NAME_LENGTH]; +extern char ril_service_name_base[MAX_SERVICE_NAME_LENGTH]; +extern char ril_service_name[MAX_SERVICE_NAME_LENGTH]; extern void RIL_register (const RIL_RadioFunctions *callbacks); extern void rilc_thread_pool (); @@ -59,7 +60,7 @@ extern void RIL_onRequestComplete(RIL_Token t, RIL_Errno e, extern void RIL_onRequestAck(RIL_Token t); -extern void RIL_setRilSocketName(char *); +extern void RIL_setServiceName(char *); #if defined(ANDROID_MULTI_SIM) extern void RIL_onUnsolicitedResponse(int unsolResponse, const void *data, @@ -147,8 +148,9 @@ int main(int argc, char **argv) { exit(0); } if (strncmp(clientId, "0", MAX_CLIENT_ID_LENGTH)) { - strlcat(rild, clientId, MAX_SOCKET_NAME_LENGTH); - RIL_setRilSocketName(rild); + strncpy(ril_service_name, ril_service_name_base, MAX_SERVICE_NAME_LENGTH); + strncat(ril_service_name, clientId, MAX_SERVICE_NAME_LENGTH); + RIL_setServiceName(ril_service_name); } if (rilLibPath == NULL) { |