commit 0e122f340e29e230c1c597d11b61944bbdd2df3e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 31 06:45:48 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 31 06:45:48 2021 +0000
tree 3969bf1bd01c313e452dd31abdcb2bfc9eb1115c
parent 710e384a8ab36c8e6e43e3a6bb0a2083460c11a7
parent 7700c1dc2dc69a841d376eba10eaa0fc4afd567e

Merge "Fix crash issue for VTS setupDataCall_1_6_osAppId" into sc-dev

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
index c21b2fc..6cf4567 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
@@ -158,6 +158,9 @@
                 {::android::hardware::radio::V1_6::RadioError::NONE,
                  ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
                  ::android::hardware::radio::V1_6::RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW}));
+        if (radioRsp_v1_6->setupDataCallResult.trafficDescriptors.size() <= 0) {
+            return;
+        }
         EXPECT_EQ(optionalTrafficDescriptor.value().osAppId.value().osAppId,
                 radioRsp_v1_6->setupDataCallResult.trafficDescriptors[0].osAppId.value().osAppId);
     }