diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-21 07:10:51 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-21 07:10:51 +0000 |
commit | 03252db5892c9a698d03d55344c459608afa8bd0 (patch) | |
tree | b7aee2bdc4bfddd3961b982d3ccfb4b9afdb71a0 | |
parent | 7e9e376ce57aae70f20d39e08c458465b4082002 (diff) | |
parent | 46e9ee36b69c86df6d9227a1a95bce1835905a23 (diff) | |
download | platform_hardware_ril-03252db5892c9a698d03d55344c459608afa8bd0.tar.gz platform_hardware_ril-03252db5892c9a698d03d55344c459608afa8bd0.tar.bz2 platform_hardware_ril-03252db5892c9a698d03d55344c459608afa8bd0.zip |
release-request-5bf29450-4eb0-4d71-a15a-d8858bf184d3-for-git_oc-release-4120128 snap-temp-L37600000076154351android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release
Change-Id: I9b6f2ee3d3e15580c80cb6aed4addc9d113050a4
-rw-r--r-- | libril/ril_service.cpp | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp index a5fa8b99..e2fb2549 100644 --- a/libril/ril_service.cpp +++ b/libril/ril_service.cpp @@ -1902,8 +1902,19 @@ Return<void> RadioImpl::setInitialAttachApn(int32_t serial, const DataProfileInf if (s_vendorFunctions->version <= 14) { RIL_InitialAttachApn iaa = {}; - if (!copyHidlStringToRil(&iaa.apn, dataProfileInfo.apn, pRI)) { - return Void(); + if (dataProfileInfo.apn.size() == 0) { + iaa.apn = (char *) calloc(1, sizeof(char)); + if (iaa.apn == NULL) { + RLOGE("Memory allocation failed for request %s", + requestToString(pRI->pCI->requestNumber)); + sendErrorResponse(pRI, RIL_E_NO_MEMORY); + return Void(); + } + iaa.apn[0] = '\0'; + } else { + if (!copyHidlStringToRil(&iaa.apn, dataProfileInfo.apn, pRI)) { + return Void(); + } } const hidl_string &protocol = @@ -1929,9 +1940,21 @@ Return<void> RadioImpl::setInitialAttachApn(int32_t serial, const DataProfileInf } else { RIL_InitialAttachApn_v15 iaa = {}; - if (!copyHidlStringToRil(&iaa.apn, dataProfileInfo.apn, pRI)) { - return Void(); + if (dataProfileInfo.apn.size() == 0) { + iaa.apn = (char *) calloc(1, sizeof(char)); + if (iaa.apn == NULL) { + RLOGE("Memory allocation failed for request %s", + requestToString(pRI->pCI->requestNumber)); + sendErrorResponse(pRI, RIL_E_NO_MEMORY); + return Void(); + } + iaa.apn[0] = '\0'; + } else { + if (!copyHidlStringToRil(&iaa.apn, dataProfileInfo.apn, pRI)) { + return Void(); + } } + if (!copyHidlStringToRil(&iaa.protocol, dataProfileInfo.protocol, pRI)) { memsetAndFreeStrings(1, iaa.apn); return Void(); |