commit 599d758081cc776cedc066d3e61d70d3ae82cf0a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 31 07:13:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 31 07:13:10 2021 +0000
tree e1453b2e6092a3b8cc47f1e05736dba824dd008c
parent 9a54d93c16222290dc9f1bad735b01c25a6aca98
parent 0e122f340e29e230c1c597d11b61944bbdd2df3e

Merge "Fix crash issue for VTS setupDataCall_1_6_osAppId" into sc-dev am: 0e122f340e

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14031550

Change-Id: I0ce6e51c8234cb9b0003394486cc101e98a0020d

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);
     }