summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPankaj Kanwar <pkanwar@google.com>2017-10-10 00:00:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-10 00:00:23 +0000
commitb330947088bc3168292b4d502e035587838c1bd8 (patch)
tree64db0fe0bcfc4fcca9e4e2f7da88e691f539c559
parent82aa01c94c1530912f6d8c61ba1d5a62cdcbed4e (diff)
parent09f5a3e63a2940921ff3a6a043cfbde00d2a002d (diff)
downloadplatform_hardware_ril-b330947088bc3168292b4d502e035587838c1bd8.tar.gz
platform_hardware_ril-b330947088bc3168292b4d502e035587838c1bd8.tar.bz2
platform_hardware_ril-b330947088bc3168292b4d502e035587838c1bd8.zip
Merge "Fix rild crash" am: 3e8f2c80f4 am: 398177045e
am: 09f5a3e63a Change-Id: I01ce32f5c2f8fb2c2c558dc9d81e037ce9183757
-rw-r--r--libril/ril_service.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index d661acf6..d4fbdc7d 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -3235,6 +3235,7 @@ int radio::getCurrentCallsResponse(int slotId,
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