From 1e5b6950165b4b1bba3651351cd4e585fc4dbdd1 Mon Sep 17 00:00:00 2001 From: sqian Date: Mon, 24 Jul 2017 14:05:29 -0700 Subject: [PATCH] Add corresponding error code to fix vts test Test: run vts Bug: 63152815 Bug: 62989786 Bug: 64041522 Change-Id: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab Merged-In: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab --- radio/1.0/vts/functional/radio_hidl_hal_data.cpp | 10 +++++----- radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp index 87ca6066c3..1e0cff433d 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp @@ -104,8 +104,8 @@ TEST_F(RadioHidlTest, deactivateDataCall) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT || - CheckOEMError()); + radioRsp->rspInfo.error == RadioError::SIM_ABSENT || CheckOEMError() || + radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE); } } @@ -230,8 +230,8 @@ TEST_F(RadioHidlTest, setDataProfile) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == - RadioError::RADIO_NOT_AVAILABLE || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT || + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); } } 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 b31ca48af5..dc4a8aec7f 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -763,8 +763,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == - RadioError::REQUEST_NOT_SUPPORTED); + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); } /* Reset back to no carrier restriction */ @@ -779,8 +778,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == - RadioError::REQUEST_NOT_SUPPORTED); + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); } }