Add radio 1.1 vts test folder.

am: c673a94a96

Change-Id: I9800dbb5789cc0db8df5ab2a31bdab50e016d618

diff --combined radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp
index 14d14d42bd6964d7f519708e907cbd262eed1790,44f69e207f1e569e39aafb9c253464e157eccba5..747b2f4731ee6698ea2b36703946c492b6eb859e
--- 1/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp
@@@ -14,7 -14,7 +14,7 @@@
   * limitations under the License.
   */
  
- #include <radio_hidl_hal_utils.h>
+ #include <radio_hidl_hal_utils_v1_0.h>
  
  using namespace ::android::hardware::radio::V1_0;
  
@@@ -77,8 -77,7 +77,8 @@@ TEST_F(RadioHidlTest, setGsmBroadcastCo
          ASSERT_TRUE(CheckGeneralError() ||
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::INVALID_STATE ||
 -                    radioRsp->rspInfo.error == RadioError::NONE);
 +                    radioRsp->rspInfo.error == RadioError::NONE ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }
  
@@@ -96,8 -95,7 +96,8 @@@ TEST_F(RadioHidlTest, getGsmBroadcastCo
  
      if (cardStatus.cardState == CardState::ABSENT) {
          ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE ||
 -                    radioRsp->rspInfo.error == RadioError::NONE);
 +                    radioRsp->rspInfo.error == RadioError::NONE ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }
  
@@@ -181,7 -179,6 +181,7 @@@ TEST_F(RadioHidlTest, setGsmBroadcastAc
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::INVALID_STATE ||
                      radioRsp->rspInfo.error == RadioError::NONE ||
 -                    radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED);
 +                    radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }

diff --combined radio/1.0/vts/functional/radio_hidl_hal_ims.cpp
index 16465c71a323f7c84f0d6e90b78e24a3d81bb1a0,75a131700d40ce00724e6b218f412844fda17fef..c1834c5692f1e9e746f1692ed82472d4d6c8cf3b
--- 1/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp
@@@ -14,7 -14,7 +14,7 @@@
   * limitations under the License.
   */
  
- #include <radio_hidl_hal_utils.h>
+ #include <radio_hidl_hal_utils_v1_0.h>
  
  using namespace ::android::hardware::radio::V1_0;
  
@@@ -190,8 -190,6 +190,8 @@@ TEST_F(RadioHidlTest, getImsRegistratio
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
 +        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE ||
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }

diff --combined radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
index be9419f4ec207f2fbe092c2903380169c2975920,5d0824c37f57dc4727a47c82eba75a795416e164..89a79ee12e8348320e44b9451103257ee7ac0671
--- 1/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@@ -14,7 -14,7 +14,7 @@@
   * limitations under the License.
   */
  
- #include <radio_hidl_hal_utils.h>
+ #include <radio_hidl_hal_utils_v1_0.h>
  
  /*
   * Test IRadio.getSignalStrength() for the response returned.
@@@ -184,7 -184,7 +184,7 @@@ TEST_F(RadioHidlTest, setBandMode) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);
      }
  }
  
@@@ -216,7 -216,7 +216,7 @@@ TEST_F(RadioHidlTest, setPreferredNetwo
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);
      }
  }
  
@@@ -441,10 -441,8 +441,10 @@@ TEST_F(RadioHidlTest, setCdmaSubscripti
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||
 -                    radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_AVAILABLE);
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
 +        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||
 +                    radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_AVAILABLE ||
 +                    radioRsp->rspInfo.error == RadioError::NONE);
      }
  }
  
@@@ -510,7 -508,7 +510,7 @@@ TEST_F(RadioHidlTest, nvReadItem) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE);
      }
  }
  
@@@ -529,7 -527,7 +529,7 @@@ TEST_F(RadioHidlTest, nvWriteItem) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE);
      }
  }
  
@@@ -546,7 -544,7 +546,7 @@@ TEST_F(RadioHidlTest, nvWriteCdmaPrl) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE);
      }
  }
  
@@@ -600,7 -598,7 +600,7 @@@ TEST_F(RadioHidlTest, getHardwareConfig
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE);
      }
  }
  
@@@ -651,7 -649,6 +651,7 @@@ TEST_F(RadioHidlTest, setRadioCapabilit
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
          ASSERT_TRUE(CheckGeneralError() ||
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::INVALID_STATE);
@@@ -670,7 -667,6 +670,7 @@@ TEST_F(RadioHidlTest, startLceService) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
          ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE ||
                      radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED ||
                      radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
@@@ -706,8 -702,7 +706,8 @@@ TEST_F(RadioHidlTest, pullLceData) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError());
 +        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError() ||
 +                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
      }
  }
  
@@@ -747,7 -742,7 +747,7 @@@ TEST_F(RadioHidlTest, setAllowedCarrier
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);
      }
  
      /* Reset back to no carrier restriction */
@@@ -761,7 -756,7 +761,7 @@@
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);
      }
  }
  
@@@ -777,7 -772,7 +777,7 @@@ TEST_F(RadioHidlTest, getAllowedCarrier
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
 +        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);
      }
  }
  
@@@ -827,8 -822,7 +827,8 @@@ TEST_F(RadioHidlTest, setSimCardPower) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
          ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
                      radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
      }
 -}
 +}

diff --combined radio/1.0/vts/functional/radio_hidl_hal_sms.cpp
index 9aa7663f265beee0e7884b43d63fff7fdf102685,70469d2eed5998a17096cda06e15699643016d20..271a23aa5b51d66f66ccdf3c1c53401630ec9bc6
--- 1/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp
@@@ -14,7 -14,7 +14,7 @@@
   * limitations under the License.
   */
  
- #include <radio_hidl_hal_utils.h>
+ #include <radio_hidl_hal_utils_v1_0.h>
  
  using namespace ::android::hardware::radio::V1_0;
  
@@@ -307,8 -307,7 +307,8 @@@ TEST_F(RadioHidlTest, deleteSmsOnSim) 
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::NONE ||
                      radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 -                    radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY);
 +                    radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }
  
@@@ -408,12 -407,7 +408,12 @@@ TEST_F(RadioHidlTest, deleteSmsOnRuim) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(CheckGeneralError());
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 +                    radioRsp->rspInfo.error == RadioError::NONE ||
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 +                    radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }
  

diff --combined radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
index 774df98d4bf7f326fec6fe9cc6c48313566fd71c,1c213030152dd5941290b44ae2af93bd0abd3cb3..4c7655914be6099aec13bfa9a32796a2465586eb
--- 1/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
@@@ -14,7 -14,7 +14,7 @@@
   * limitations under the License.
   */
  
- #include <radio_hidl_hal_utils.h>
+ #include <radio_hidl_hal_utils_v1_0.h>
  
  using namespace ::android::hardware::radio::V1_0;
  
@@@ -34,10 -34,7 +34,10 @@@ TEST_F(RadioHidlTest, sendEnvelope) 
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 +                    radioRsp->rspInfo.error == RadioError::NONE);
      }
  
      // Test with sending random string
@@@ -51,10 -48,7 +51,10 @@@
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 +                    radioRsp->rspInfo.error == RadioError::NONE);
      }
  }
  
@@@ -74,10 -68,7 +74,10 @@@ TEST_F(RadioHidlTest, sendTerminalRespo
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 +                    radioRsp->rspInfo.error == RadioError::NONE);
      }
  
      serial = GetRandomSerialNumber();
@@@ -92,9 -83,7 +92,9 @@@
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
      }
  }
  
@@@ -112,10 -101,12 +112,10 @@@ TEST_F(RadioHidlTest, handleStkCallSetu
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
 -                    radioRsp->rspInfo.error == RadioError::SYSTEM_ERR ||
 -                    radioRsp->rspInfo.error == RadioError::NO_MEMORY ||
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::NONE ||
                      radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 -                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 -                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
      }
  }
  
@@@ -132,8 -123,7 +132,8 @@@ TEST_F(RadioHidlTest, reportStkServiceI
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::NONE);
      }
  }
  
@@@ -154,8 -144,7 +154,8 @@@ TEST_F(RadioHidlTest, sendEnvelopeWithS
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
      }
  
      // Test with sending random string
@@@ -169,7 -158,6 +169,7 @@@
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 -        ASSERT_FALSE(RadioError::NONE == radioRsp->rspInfo.error);
 +        ASSERT_TRUE(CheckGeneralError() ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
      }
  }

diff --combined radio/1.0/vts/functional/radio_hidl_hal_test.cpp
index b957c6e5b3eafa2e50a031dbc7f898c9f285aae1,5b9130e07be4bc67b28de4de71f84a2bc95124a7..2fa2827978cdf8aaa141d2405703d698e63f9ee5
--- 1/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
@@@ -14,7 -14,7 +14,7 @@@
   * limitations under the License.
   */
  
- #include <radio_hidl_hal_utils.h>
+ #include <radio_hidl_hal_utils_v1_0.h>
  
  void RadioHidlTest::SetUp() {
      radio =
@@@ -65,11 -65,10 +65,11 @@@ bool RadioHidlTest::CheckGeneralError(
              radioRsp->rspInfo.error == RadioError::NO_MEMORY ||
              radioRsp->rspInfo.error == RadioError::INTERNAL_ERR ||
              radioRsp->rspInfo.error == RadioError::SYSTEM_ERR ||
 -            radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
 +            radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED ||
 +            radioRsp->rspInfo.error == RadioError::CANCELLED);
  }
  
  bool RadioHidlTest::CheckOEMError() {
      return (radioRsp->rspInfo.error >= RadioError::OEM_ERROR_1 &&
              radioRsp->rspInfo.error <= RadioError::OEM_ERROR_25);
 -}
 +}

diff --combined radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h
index a0d7f70862b1dc180416fc8d26e7db99bedc0d7d,3bd69ab2104cc4c2f53734c58674d84c72136f04..c126da444b623b6f246088331b2b14a329afb418
--- 1/radio/1.0/vts/functional/radio_hidl_hal_utils.h
--- 2/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h
+++ b/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h
@@@ -26,7 -26,7 +26,7 @@@
  #include <android/hardware/radio/1.0/IRadioResponse.h>
  #include <android/hardware/radio/1.0/types.h>
  
- #include <vts_test_util.h>
+ #include "vts_test_util.h"
  
  using ::android::hardware::radio::V1_0::ActivityStatsInfo;
  using ::android::hardware::radio::V1_0::AppType;
@@@ -82,7 -82,7 +82,7 @@@ using ::android::hardware::Return
  using ::android::hardware::Void;
  using ::android::sp;
  
 -#define TIMEOUT_PERIOD 40
 +#define TIMEOUT_PERIOD 75
  #define RADIO_SERVICE_NAME "slot1"
  
  class RadioHidlTest;
@@@ -90,7 -90,7 +90,7 @@@ extern CardStatus cardStatus
  
  /* Callback class for radio response */
  class RadioResponse : public IRadioResponse {
-    private:
+    protected:
      RadioHidlTest& parent;
  
     public:
@@@ -442,7 -442,7 +442,7 @@@
  
  // The main test class for Radio HIDL.
  class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase {
-    private:
+    protected:
      std::mutex mtx;
      std::condition_variable cv;
      int count;

diff --combined radio/1.0/vts/functional/radio_hidl_hal_voice.cpp
index d57360fd4072909419b8f0efc7fa3862cfe66124,e6036dbf3989a7eea41b5cb7cef5de6d9443c581..db0fb7b7e1340bf1629f5a6276983fc5fc4819cc
--- 1/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp
@@@ -14,7 -14,7 +14,7 @@@
   * limitations under the License.
   */
  
- #include <radio_hidl_hal_utils.h>
+ #include <radio_hidl_hal_utils_v1_0.h>
  
  /*
   * Test IRadio.getCurrentCalls() for the response returned.
@@@ -365,7 -365,6 +365,7 @@@ TEST_F(RadioHidlTest, sendCDMAFeatureCo
      EXPECT_EQ(serial, radioRsp->rspInfo.serial);
  
      if (cardStatus.cardState == CardState::ABSENT) {
 +        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
          ASSERT_TRUE(CheckGeneralError() ||
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::NONE ||
@@@ -391,8 -390,7 +391,8 @@@ TEST_F(RadioHidlTest, sendDtmf) 
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::NONE ||
                      radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID ||
 -                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }
  
@@@ -412,8 -410,7 +412,8 @@@ TEST_F(RadioHidlTest, startDtmf) 
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::NONE ||
                      radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID ||
 -                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }
  
@@@ -431,8 -428,7 +431,8 @@@ TEST_F(RadioHidlTest, stopDtmf) 
      if (cardStatus.cardState == CardState::ABSENT) {
          ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE ||
                      radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID ||
 -                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 +                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);
      }
  }
  
@@@ -485,7 -481,6 +485,7 @@@ TEST_F(RadioHidlTest, sendBurstDtmf) 
          ASSERT_TRUE(CheckGeneralError() ||
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::INVALID_STATE ||
 -                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 +                    radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED);
      }
  }