commit 0e9094142f4568af82aeb0f30eac341df1782faf
author yinxu <yinxu@google.com> Tue Jul 25 15:15:52 2017 -0700
committer yinxu <yinxu@google.com> Wed Jul 26 11:09:44 2017 -0700
tree c05e98ac5c86f8c395297e2404a95b0e75bafe5d
parent 6ef70c9040773aa501ee54b54efc15a7ea61b25f

Fix VTS errors of the network scan API

Since the new network scan API is only supported by some devices, we
should add the REQUEST_NOT_SUPPORTED to the possible returned errors.

Cherry-picked cleanly from:
https://googleplex-android-review.git.corp.google.com/#/c/2596051/

Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 63914600
Merged-in: I965ee6422aaa5e02bf67466f5288b808183f1738
Change-Id: I965ee6422aaa5e02bf67466f5288b808183f1738
(cherry picked from commit 03c6b592c1eeec984eb31914dbf60bc05887cdec)

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 2172454..e4d434a 100644
--- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
@@ -63,7 +63,8 @@
     if (cardStatus.cardState == CardState::ABSENT) {
         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::INVALID_ARGUMENTS ||
+                    radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
     }
 }
 
@@ -84,7 +85,8 @@
 
     if (cardStatus.cardState == CardState::ABSENT) {
         ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
-                    radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT);
+                    radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||
+                    radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
     }
 }
 
@@ -101,6 +103,7 @@
 
     if (cardStatus.cardState == CardState::ABSENT) {
         ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE ||
-                    radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT);
+                    radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||
+                    radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
     }
 }