commit 9f7b41ae086673fbd206788db3471dd39e4245cd
author Sarah Kim <sarahchin@google.com> Tue Sep 12 22:56:21 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 12 22:56:21 2023 +0000
tree 4d64402487aff323b1b9281f9a595de54a101a3f
parent 660b502dfd13b40bd32ea17f812a707c354bde6f
parent 98843a2b8bcc3041e75f720a5a2471a806bbe221

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

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

Change-Id: Ie974d9a85fa633142080a318ecddf4a69fb84626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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,