diff options
| author | Divya Sharma <divyash@codeaurora.org> | 2018-02-01 05:06:14 -0800 |
|---|---|---|
| committer | Divya Sharma <divyash@codeaurora.org> | 2018-02-01 05:06:14 -0800 |
| commit | 7b80899079255a640e914240d064ced33e55fda1 (patch) | |
| tree | 7f8408ffdd0d03a772a0f75766bccd4ee166ad4a | |
| parent | a0d7acdc920460e72cf7d0c77bbdc8f9907c4b59 (diff) | |
| parent | 557a53b2d316507a14857414a6e55bed40da7458 (diff) | |
| download | android_hardware_ril-7b80899079255a640e914240d064ced33e55fda1.tar.gz android_hardware_ril-7b80899079255a640e914240d064ced33e55fda1.tar.bz2 android_hardware_ril-7b80899079255a640e914240d064ced33e55fda1.zip | |
PPR1.180130.002_AOSP_Merge
Change-Id: I41143f6b640d90ce946e6330881049cb5fa80910
| -rw-r--r-- | reference-ril/reference-ril.c | 2 | ||||
| -rw-r--r-- | rild/Android.mk | 3 | ||||
| -rw-r--r-- | rild/rild.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 7b93bf1..3ab7bee 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -666,7 +666,7 @@ static void requestOrSendDataCallList(RIL_Token *t) } responses[i].dnses = dnslist; - responses[i].gateways = "10.0.2.15 fe80::2"; + responses[i].gateways = "10.0.2.2 fe80::2"; responses[i].mtu = DEFAULT_MTU; } else { diff --git a/rild/Android.mk b/rild/Android.mk index fdf7529..19eba74 100644 --- a/rild/Android.mk +++ b/rild/Android.mk @@ -1,5 +1,7 @@ # Copyright 2006 The Android Open Source Project +ifndef ENABLE_VENDOR_RIL_SERVICE + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -30,3 +32,4 @@ LOCAL_MODULE:= rild include $(BUILD_EXECUTABLE) +endif diff --git a/rild/rild.c b/rild/rild.c index dbd925d..685ef70 100644 --- a/rild/rild.c +++ b/rild/rild.c @@ -144,8 +144,8 @@ int main(int argc, char **argv) { exit(0); } if (strncmp(clientId, "0", MAX_CLIENT_ID_LENGTH)) { - strncpy(ril_service_name, ril_service_name_base, MAX_SERVICE_NAME_LENGTH); - strncat(ril_service_name, clientId, MAX_SERVICE_NAME_LENGTH); + snprintf(ril_service_name, sizeof(ril_service_name), "%s%s", ril_service_name_base, + clientId); } if (rilLibPath == NULL) { |