commit b330947088bc3168292b4d502e035587838c1bd8
author Pankaj Kanwar <pkanwar@google.com> Tue Oct 10 00:00:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 10 00:00:23 2017 +0000
tree 64db0fe0bcfc4fcca9e4e2f7da88e691f539c559
parent 82aa01c94c1530912f6d8c61ba1d5a62cdcbed4e
parent 09f5a3e63a2940921ff3a6a043cfbde00d2a002d

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

Change-Id: I01ce32f5c2f8fb2c2c558dc9d81e037ce9183757

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