OSDN Git Service

Add the error code "OPERATION_NOT_ALLOWED" and log the error.
authoryinxu <yinxu@google.com>
Mon, 7 Aug 2017 17:29:10 +0000 (10:29 -0700)
committeryinxu <yinxu@google.com>
Tue, 8 Aug 2017 17:31:03 +0000 (10:31 -0700)
Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 64426938
Change-Id: Id4f06842186b10a52640372c23bc2b368cc1e9ab

radio/1.1/vts/functional/radio_hidl_hal_api.cpp

index c6ac8a6..ad30e49 100644 (file)
@@ -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);