summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsqian <shuoq@google.com>2018-06-15 14:24:31 -0700
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-06-26 23:44:33 +0000
commit561580a914ba377048404659ac40ac14be75edc7 (patch)
tree2ea143747d379dfb0dd64125e80614a47da01c68
parentfd547ab6ce39423fc99524f391d709f428673d1f (diff)
downloadandroid_hardware_interfaces-561580a914ba377048404659ac40ac14be75edc7.tar.gz
android_hardware_interfaces-561580a914ba377048404659ac40ac14be75edc7.tar.bz2
android_hardware_interfaces-561580a914ba377048404659ac40ac14be75edc7.zip
Add REQUEST_NOT_SUPPORTED for changeIccPinForApp and changeIccPin2ForApp
Bug: 110037298 Test: run vts -m VtsHalRadioV1_0Target Change-Id: Iaba800814c5a6950d086a2f105714d01fdaa14a4 (cherry picked from commit 7470cbd04dbb90ec4a6481d08db54c6a8c5f2efd)
-rw-r--r--radio/1.0/vts/functional/radio_hidl_hal_icc.cpp8
1 files changed, 6 insertions, 2 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 b764b1328..73e26d2d9 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
@@ -136,7 +136,9 @@ TEST_F(RadioHidlTest, changeIccPinForApp) {
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}));
}
}
}
@@ -159,7 +161,9 @@ 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);
- EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error);
+ ASSERT_TRUE(CheckAnyOfErrors(
+ radioRsp->rspInfo.error,
+ {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED}));
}
}
}