commit 484b05c883beca8b54fb66e06484a77755a207bd
author Pankaj Kanwar <pkanwar@google.com> Tue Oct 10 00:10:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 10 00:10:49 2017 +0000
tree 2a42c8af67f64b38d6c4fb109eb63a4e31aeeaab
parent 072d10dc3fd84f83c0bec1c4b3102c56eea13089
parent b330947088bc3168292b4d502e035587838c1bd8

Merge "Fix rild crash" am: 3e8f2c80f4 am: 398177045e am: 09f5a3e63a
am: b330947088

Change-Id: I1323c87a145136d0208376b56cc8cd7a60ed6838

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index d661acf..d4fbdc7 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -3235,6 +3235,7 @@
                 calls[i].namePresentation = (CallPresentation) p_cur->namePresentation;
                 if (p_cur->uusInfo != NULL && p_cur->uusInfo->uusData != NULL) {
                     RIL_UUS_Info *uusInfo = p_cur->uusInfo;
+                    calls[i].uusInfo.resize(1);
                     calls[i].uusInfo[0].uusType = (UusType) uusInfo->uusType;
                     calls[i].uusInfo[0].uusDcs = (UusDcs) uusInfo->uusDcs;
                     // convert uusInfo->uusData to a null-terminated string