diff options
| author | sqian <shuoq@google.com> | 2018-07-16 08:36:50 -0700 |
|---|---|---|
| committer | sqian <shuoq@google.com> | 2018-07-16 08:36:50 -0700 |
| commit | 898d05a713a693670cd450ff3f50156fed2f4567 (patch) | |
| tree | aea0d7867c709d853b52bb68eceaa4263d0f333f | |
| parent | c0243f2ff85d3d8d897f34d063177169e736a500 (diff) | |
| parent | dfa79a6292a42dd8609053febd8df7d5e7d48fbf (diff) | |
| download | platform_hardware_interfaces-898d05a713a693670cd450ff3f50156fed2f4567.tar.gz platform_hardware_interfaces-898d05a713a693670cd450ff3f50156fed2f4567.tar.bz2 platform_hardware_interfaces-898d05a713a693670cd450ff3f50156fed2f4567.zip | |
resolve merge conflicts of dfa79a6292a42dd8609053febd8df7d5e7d48fbf to oreo-mr1-vts-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I10919718b841fdb33ab0e873d1b4bbd787fafcd2
| -rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp index e450493d20..2098398c67 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -689,7 +689,8 @@ TEST_F(RadioHidlTest, startLceService) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED || radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + radioRsp->rspInfo.error == RadioError::SIM_ABSENT || + radioRsp->rspInfo.error == RadioError::NONE); } } @@ -726,7 +727,8 @@ TEST_F(RadioHidlTest, pullLceData) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError() || radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || - radioRsp->rspInfo.error == RadioError::NONE); + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } |