Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from topic 'fix-vts-test' into oc-dev

Browse Source 
am: a64eb7c698

Change-Id: I3ed89c13301ce07e5fc8ac0be59f33dbf4be492b
This commit is contained in:
Shuo Qian
2017-05-18 22:59:25 +00:00
committed by android-build-merger
parent 7f7a0a880c a64eb7c698
commit 8d0e10f08d
5 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
current.txt
View File

@@ -130,7 +130,7 @@ deee1dc4948f33af207e1008aba0f6cc07afb7900eab53f33192c8cac137eefc android.hardwar
efc83df3f962b93c7c0290d691d7d300dabe12683e2cde3591fb3c0beedce20f android.hardware.power@1.0::types
9b5aa499ec3b4226f15f48f5ed08896e2fc0676f978c9e199c1da21daaf002a6 android.hardware.radio@1.0::IRadio
5c8efbb9c451a59737ed2c6c20230aae4745839ca01d8088d6dcc9020e52d2c5 android.hardware.radio@1.0::IRadioIndication
2b963c12b5b6961a6fcec6e6cbe3ed6cc8c4a7e95916c4947d8196d56aa57ec2 android.hardware.radio@1.0::IRadioResponse
c5f22264a31562e009bb284287051b7998fc46cd3294df61c9e6a1d622184993 android.hardware.radio@1.0::IRadioResponse
de3ab9f73b1073cd677b19d886fb927e9381b30161a704712d2b30f875873f5c android.hardware.radio@1.0::ISap
d183e406ef0897df2117a9dde384e8e6ea4fa6ab1c7f6f28e65b87011218c9ea android.hardware.radio@1.0::ISapCallback
96986fbd22f0e6ca752e1fcdc0a64bda213995a81f5f36bc4faf3532d9306b97 android.hardware.radio@1.0::types

13
radio/1.0/IRadioResponse.hal
View File

@@ -102,8 +102,13 @@ interface IRadioResponse {
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE (radio resetting)
* RadioError:PASSWORD_INCORRECT (code is invalid)
* RadioError:NO_MEMORY
* RadioError:INVALID_SIM_STATE
* RadioError:INTERNAL_ERR
* RadioError:SYSTEM_ERR
* RadioError:MODEM_ERR
* RadioError:INVALID_ARGUMENTS
*/
oneway supplyNetworkDepersonalizationResponse(RadioResponseInfo info, int32_t remainingRetries);
@@ -1119,9 +1124,11 @@ interface IRadioResponse {
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:NO_MEMORY
* RadioError:INTERNAL_ERR
* RadioError:SYSTEM_ERR
* RadioError:MODEM_ERR
* RadioError:INVALID_ARGUMENTS
* RadioError:OPERATION_NOT_ALLOWED
*/
oneway handleStkCallSetupRequestFromSimResponse(RadioResponseInfo info);

9
radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
View File

@@ -316,8 +316,13 @@ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) {
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(CheckGeneralError() ||
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error == RadioError::SYSTEM_ERR ||
radioRsp->rspInfo.error == RadioError::NO_MEMORY ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT);
radioRsp->rspInfo.error == RadioError::INVALID_SIM_STATE ||
radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT ||
radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
}
}

7
radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
View File

@@ -98,7 +98,12 @@ TEST_F(RadioHidlTest, handleStkCallSetupRequestFromSim) {
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error == RadioError::SYSTEM_ERR ||
radioRsp->rspInfo.error == RadioError::NO_MEMORY ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
}
}

3
radio/1.0/vts/functional/sap_hidl_hal_api.cpp
View File

@@ -51,7 +51,8 @@ TEST_F(SapHidlTest, apduReq) {
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(sapCb->sapResponseToken, token);
ASSERT_TRUE(SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode ||
ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode ||
SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode ||
SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode ||
SapResultCode::CARD_REMOVED == sapCb->sapResultCode);
}