diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-04-04 22:01:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-04 22:01:37 +0000 |
| commit | 25f66a9aa9f0556c0a98d2d11f709d807d601b2f (patch) | |
| tree | 6b9f0a27b8d0f04195df720cb14f081ca75cb2cc /rild | |
| parent | 35a9183f59b1dc7c5d93acaa715b698207e783d9 (diff) | |
| parent | 7955c43727b86f559ade21de682035b9f9c4cc4b (diff) | |
| download | android_hardware_ril-25f66a9aa9f0556c0a98d2d11f709d807d601b2f.tar.gz android_hardware_ril-25f66a9aa9f0556c0a98d2d11f709d807d601b2f.tar.bz2 android_hardware_ril-25f66a9aa9f0556c0a98d2d11f709d807d601b2f.zip | |
Merge "Change radio related service names to slot1, slot2, slot3..."
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 58bd273..ce04040 100644 --- a/rild/rild.c +++ b/rild/rild.c @@ -47,7 +47,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 (); @@ -60,7 +61,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, @@ -193,8 +194,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) { |