Merge "Add NONE for LceService" into oreo-vts-dev (dfa79a62) · Commits · e / os / android_hardware_interfaces

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+6 −8

Original line number	Diff line number	Diff line
		@@ -687,11 +687,11 @@ TEST_F(RadioHidlTest, startLceService) {

		if (cardStatus.cardState == CardState::ABSENT) {
		std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
		ASSERT_TRUE(radioRsp->rspInfo.error ==
		RadioError::RADIO_NOT_AVAILABLE \|\|
		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);
		}
		}

		@@ -709,8 +709,7 @@ TEST_F(RadioHidlTest, stopLceService) {
		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED \|\|
		radioRsp->rspInfo.error ==
		RadioError::REQUEST_NOT_SUPPORTED \|\|
		radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED \|\|
		radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
		}
		}
		@@ -727,10 +726,9 @@ TEST_F(RadioHidlTest, pullLceData) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(radioRsp->rspInfo.error ==
		RadioError::RADIO_NOT_AVAILABLE \|\|
		CheckOEMError() \|\|
		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::SIM_ABSENT);
		}
		}