diff options
| author | sqian <shuoq@google.com> | 2018-07-09 14:45:12 -0700 |
|---|---|---|
| committer | Hsin-Yi Chen <hsinyichen@google.com> | 2018-08-22 19:04:18 +0800 |
| commit | ad34a11fba0f728d994d94819478b0740e883eb9 (patch) | |
| tree | c8bd7a7de525af8919ab1ec488da562eba5bf5f3 /radio | |
| parent | dd06d73cabd7ca0df542e7384978c4c6b5087632 (diff) | |
| download | android_hardware_interfaces-ad34a11fba0f728d994d94819478b0740e883eb9.tar.gz android_hardware_interfaces-ad34a11fba0f728d994d94819478b0740e883eb9.tar.bz2 android_hardware_interfaces-ad34a11fba0f728d994d94819478b0740e883eb9.zip | |
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)
Diffstat (limited to 'radio')
| -rw-r--r-- | radio/1.0/IRadioResponse.hal | 2 | ||||
| -rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_icc.cpp | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal index 27945cb07..c1b16b7b8 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 0985f4ca7..c3c2d90db 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})); } } } |