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

Commit 630eb2d3 authored by sqian's avatar sqian Committed by android-build-merger
Browse files

Merge "Add None into cancelPendingUssd" into oreo-vts-dev 

am: 4ccc3b01

Change-Id: Ie4fa81b5df618862c3af5b8836c059a348e9cb65
parents eebf378c 4ccc3b01

radio/1.0/vts/functional/radio_hidl_hal_voice.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -214,7 +214,8 @@ TEST_F(RadioHidlTest, cancelPendingUssd) { 




    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||

                    radioRsp->rspInfo.error == RadioError::NONE);

    }

    }

}

}