Merge "Add null check for osAppId" into stage-aosp-udc-ts-dev am: 848650fd00

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

Change-Id: I5cca563ef7bea0a277b722512b992baccb6a90f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sarah Kim
2023-09-12 21:05:18 +00:00
committed by Automerger Merge Worker

View File

@@ -214,7 +214,8 @@ TEST_P(RadioDataTest, setupDataCall_osAppId) {
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_data->rspInfo.error, ASSERT_TRUE(CheckAnyOfErrors(radioRsp_data->rspInfo.error,
{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW})); 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; return;
} }
EXPECT_EQ(trafficDescriptor.osAppId.value().osAppId, EXPECT_EQ(trafficDescriptor.osAppId.value().osAppId,