From 41815045237eaa7ba6431411bdb222736ceaf9df Mon Sep 17 00:00:00 2001 From: yinxu Date: Mon, 7 Aug 2017 10:29:10 -0700 Subject: [PATCH] Add the error code "OPERATION_NOT_ALLOWED" and log the error. Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target Bug: 64426938 Change-Id: Id4f06842186b10a52640372c23bc2b368cc1e9ab --- radio/1.1/vts/functional/radio_hidl_hal_api.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp index c6ac8a6c38..ad30e49822 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp @@ -61,10 +61,12 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan) { EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { + ALOGI("startNetworkScan, rspInfo.error = %d\n", (int32_t)radioRsp_v1_1->rspInfo.error); ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE || radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT || radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || + radioRsp_v1_1->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); } } @@ -84,6 +86,8 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan_InvalidArgument) { EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { + ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %d\n", + (int32_t)radioRsp_v1_1->rspInfo.error); ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS || radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT || radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); @@ -102,6 +106,7 @@ TEST_F(RadioHidlTest_v1_1, stopNetworkScan) { EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { + ALOGI("stopNetworkScan rspInfo.error = %d\n", (int32_t)radioRsp_v1_1->rspInfo.error); ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE || radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT || radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);