| commit | b668cff7ffe07b6c4ff0d0a122373e021191f56e | [log] [tgz] |
|---|---|---|
| author | Sarah Kim <sarahchin@google.com> | Tue Sep 12 21:05:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 12 21:05:18 2023 +0000 |
| tree | dd0a6e99e2cc0d2c561b08ce5938eba1515f57a8 | |
| parent | 2a521d6e8936121cb7f1be71159d762a5a50aba4 [diff] | |
| parent | 848650fd00938d1f3f7fae2b3240d596c841716c [diff] |
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>
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,