From 35bf8e1b500d7ac2e8dffbc0bf7fe5abf384dcad Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Thu, 7 Sep 2023 16:16:38 -0700 Subject: [PATCH] Add null check for osAppId Test: atest VtsHalRadioTargetTest Bug: 297467393 Change-Id: Ib94d118765bf527ba51d5e7e29942cec6bff61c4 --- radio/aidl/vts/radio_data_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radio/aidl/vts/radio_data_test.cpp b/radio/aidl/vts/radio_data_test.cpp index 0fb2fb404f..f31c254277 100644 --- a/radio/aidl/vts/radio_data_test.cpp +++ b/radio/aidl/vts/radio_data_test.cpp @@ -214,7 +214,8 @@ TEST_P(RadioDataTest, setupDataCall_osAppId) { 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,