Merge "Add None into cancelPendingUssd" into oreo-vts-dev

am: 4ccc3b0140

Change-Id: Ie4fa81b5df618862c3af5b8836c059a348e9cb65
This commit is contained in:
sqian
2018-01-25 02:41:42 +00:00
committed by android-build-merger

View File

@@ -214,7 +214,8 @@ TEST_F(RadioHidlTest, cancelPendingUssd) {
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR);
radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
radioRsp->rspInfo.error == RadioError::NONE);
}
}
@@ -488,4 +489,4 @@ TEST_F(RadioHidlTest, sendBurstDtmf) {
radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED);
}
}
}