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

Commit 2cb32bb6 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Add SIM_PUK2 for Icc VTS tests" into pi-dev 

am: bef00fe1

Change-Id: I2ab9b4e2a2ed306edf2918f95fd44118ecf06a8e
parents 76cc9c84 bef00fe1

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -388,3 +388,4 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar 
1a5ae9793223658174258b523763c557abad6fb917df0b8e3cc097fc89035811 android.hardware.neuralnetworks@1.0::types

4310eb8272f085914952f3bfb73a8f8bb477a80e8b93596f0ea5acb58546b66d android.hardware.neuralnetworks@1.1::types

1d19720d4fd38b1095f0f555a4bd92b3b12c9b1d0f560b0e9a474cd6dcc20db6 android.hardware.radio@1.2::IRadio

1d4a5776614c08b5d794a5ec5ab04697260cbd4b3441d5935cd53ee71d19da02 android.hardware.radio@1.0::IRadioResponse

radio/1.0/IRadioResponse.hal

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ interface IRadioResponse { 
     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:INVALID_SIM_STATE

     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:SIM_PUK2

     */

    oneway supplyIccPin2ForAppResponse(RadioResponseInfo info, int32_t remainingRetries);
@@ -141,6 +142,7 @@ interface IRadioResponse { 
     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:INVALID_SIM_STATE

     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:SIM_PUK2

     */

    oneway changeIccPin2ForAppResponse(RadioResponseInfo info, int32_t remainingRetries);

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+6 −4
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ TEST_F(RadioHidlTest, supplyIccPin2ForApp) { 
            EXPECT_EQ(std::cv_status::no_timeout, wait());

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

            EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

            EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error);

            ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                         {RadioError::PASSWORD_INCORRECT, RadioError::SIM_PUK2}));

        }

    }

}
@@ -161,9 +162,10 @@ TEST_F(RadioHidlTest, changeIccPin2ForApp) { 
            EXPECT_EQ(std::cv_status::no_timeout, wait());

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

            EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

            ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp->rspInfo.error,

                {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED}));

            ASSERT_TRUE(

                CheckAnyOfErrors(radioRsp->rspInfo.error,

                                 {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED,

                                  RadioError::SIM_PUK2}));

        }

    }

}