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

Commit 7f2837f8 authored by Dominik Maier's avatar Dominik Maier Committed by Android (Google) Code Review
Browse files

Merge "Update setNullCipherAndIntegrityEnabled API."

parents 5bef862c c1a127e9

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

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

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:REQUEST_NOT_SUPPORTED

     */

    void setNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info);

radio/aidl/vts/radio_network_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2021,8 +2021,8 @@ TEST_P(RadioNetworkTest, isNullCipherAndIntegrityEnabled) { 
    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::RADIO_NOT_AVAILABLE,

                                  RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

    LOG(DEBUG) << "isNullCipherAndIntegrityEnabled finished";

}