From ad34a11fba0f728d994d94819478b0740e883eb9 Mon Sep 17 00:00:00 2001 From: sqian Date: Mon, 9 Jul 2018 14:45:12 -0700 Subject: [PATCH 1/2] Add SIM_PUK2 for Icc VTS tests Add SIM_PUK2 for supplyIccPin2ForApp and changeIccPin2ForApp if sim card is in the puk2 state. Bug: 111211929 Test: sanity Change-Id: I80d924cc4a61565887cbd2a65ee5927a42ad656e Merged-In: I80d924cc4a61565887cbd2a65ee5927a42ad656e (cherry picked from commit 4ed0a216adc3bc9460d11d302ba53db9707ded44) --- current.txt | 1 + radio/1.0/IRadioResponse.hal | 2 ++ radio/1.0/vts/functional/radio_hidl_hal_icc.cpp | 10 ++++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/current.txt b/current.txt index 316bc4348a..4f574e9ed9 100644 --- a/current.txt +++ b/current.txt @@ -386,3 +386,4 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar # ABI preserving changes to HALs after Android P 1d19720d4fd38b1095f0f555a4bd92b3b12c9b1d0f560b0e9a474cd6dcc20db6 android.hardware.radio@1.2::IRadio +1d4a5776614c08b5d794a5ec5ab04697260cbd4b3441d5935cd53ee71d19da02 android.hardware.radio@1.0::IRadioResponse diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal index 27945cb07f..c1b16b7b83 100644 --- a/radio/1.0/IRadioResponse.hal +++ b/radio/1.0/IRadioResponse.hal @@ -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); diff --git a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp index 0985f4ca74..c3c2d90dbc 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp @@ -91,7 +91,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})); } } } @@ -163,9 +164,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})); } } } From 5fd0ccf7a8402991a70ebd55ae5aad3a41172b06 Mon Sep 17 00:00:00 2001 From: sqian Date: Thu, 12 Jul 2018 16:30:24 -0700 Subject: [PATCH 2/2] Add REQUEST_NOT_SUPPORTED for pin and pin2 Icc VTS Bug: 111222834 Test: sanity Change-Id: Ia3b96e83d6173c2c80bdbf7763a876883b167af9 Merged-In: Ia3b96e83d6173c2c80bdbf7763a876883b167af9 (cherry picked from commit c0a06f34c88cf9dc017be6178113b35c3c7fc67e) --- radio/1.0/vts/functional/radio_hidl_hal_icc.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp index c3c2d90dbc..2d9d6d0d4d 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp @@ -44,7 +44,9 @@ TEST_F(RadioHidlTest, supplyIccPinForApp) { 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::REQUEST_NOT_SUPPORTED})); } } } @@ -91,8 +93,10 @@ 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); - ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, - {RadioError::PASSWORD_INCORRECT, RadioError::SIM_PUK2})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::SIM_PUK2})); } } }