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

Commit eca109f7 authored by Yomna Nasser's avatar Yomna Nasser Committed by Android (Google) Code Review
Browse files

Merge "setNullCipherAndIntegrityEnabled VTS to return REQUEST_NOT_SUPPORTED"

parents c88ea613 d4f59473

radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl

+1 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ oneway interface IRadioNetworkResponse { 
     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:REQUEST_NOT_SUPPORTED

     */

    void isNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info, in boolean isEnabled);

radio/aidl/vts/radio_network_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2001,9 +2001,9 @@ TEST_P(RadioNetworkTest, setNullCipherAndIntegrityEnabled) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

    EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);



    ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_network->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,

                                 {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,

                                  RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));

    LOG(DEBUG) << "setNullCipherAndIntegrityEnabled finished";

}