commit d6182b21a58bdac01287d73b5d71b791bf74f968
author Jiabin Huang <jiabin@google.com> Tue Sep 12 23:09:44 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 12 23:09:44 2023 +0000
tree d42c4e4370ed4e13162a07f6550097eb0d7e1c6c
parent 9f7b41ae086673fbd206788db3471dd39e4245cd
parent 1e467c28493e6306dc48d5822db8ea7cc7d28fbc

Merge "AHAL: fix stack overflow when connecting usb device." into main

radio/aidl/vts/radio_data_test.cpp

diff --git a/radio/aidl/vts/radio_data_test.cpp b/radio/aidl/vts/radio_data_test.cpp
index 0fb2fb4..f31c254 100644
--- a/radio/aidl/vts/radio_data_test.cpp
+++ b/radio/aidl/vts/radio_data_test.cpp
@@ -214,7 +214,8 @@
         ASSERT_TRUE(CheckAnyOfErrors(radioRsp_data->rspInfo.error,
                                      {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
                                       RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW}));
-        if (radioRsp_data->setupDataCallResult.trafficDescriptors.size() <= 0) {
+        if (radioRsp_data->setupDataCallResult.trafficDescriptors.size() <= 0 ||
+            !radioRsp_data->setupDataCallResult.trafficDescriptors[0].osAppId.has_value()) {
             return;
         }
         EXPECT_EQ(trafficDescriptor.osAppId.value().osAppId,