commit 35bf8e1b500d7ac2e8dffbc0bf7fe5abf384dcad
author Sarah Chin <sarahchin@google.com> Thu Sep 07 16:16:38 2023 -0700
committer Sarah Kim <sarahchin@google.com> Thu Sep 07 23:19:41 2023 +0000
tree a2d0001a35ab54077ebf4820b12ed6dc1faa21ab
parent 69a3cf679df80e0cc69931a431d26e9582024b65

Add null check for osAppId

Test: atest VtsHalRadioTargetTest
Bug: 297467393
Change-Id: Ib94d118765bf527ba51d5e7e29942cec6bff61c4

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,