commit 131854f401d031bd7605214f9b59a81972a2a1bc
author yinxu <yinxu@google.com> Mon Aug 07 10:29:10 2017 -0700
committer yinxu <yinxu@google.com> Wed Aug 09 10:15:59 2017 -0700
tree a2844d8c2b4475d240d639bb4a49887a8f47c44f
parent 282278fa9ec8aa09446f2a390560b4e754bdbc88

Add the error code "OPERATION_NOT_ALLOWED" and log the error.

Cherry-picked cleanly from:
https://googleplex-android-review.git.corp.google.com/#/c/platform/hardware/interfaces/+/2678915/

Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 64426938
Merged-in: Id4f06842186b10a52640372c23bc2b368cc1e9ab
Change-Id: Id4f06842186b10a52640372c23bc2b368cc1e9ab
(cherry picked from commit 41815045237eaa7ba6431411bdb222736ceaf9df)

radio/1.1/vts/functional/radio_hidl_hal_api.cpp

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 70c1924..9676c5c 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 @@
     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 @@
     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 @@
     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);