Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54c5f204 authored by Sarah Kim's avatar Sarah Kim Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I7e737573aab11945034de157a10d2c7a57d06781
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca212b47 d6f28c35

radio/aidl/vts/radio_data_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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,