commit 630eb2d3b897e424149e1ccd7d6c8ab17d99008b
author sqian <shuoq@google.com> Thu Jan 25 02:41:42 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 25 02:41:42 2018 +0000
tree 7acb9c6fea392507cd2c0d211f47f3d06f6ffe3e
parent eebf378ccff6dd5cbdcf5e287aa8c025be9ee072
parent 4ccc3b01402fd9b5a00b305aa984cd157fe4ce43

Merge "Add None into cancelPendingUssd" into oreo-vts-dev
am: 4ccc3b0140

Change-Id: Ie4fa81b5df618862c3af5b8836c059a348e9cb65

radio/1.0/vts/functional/radio_hidl_hal_voice.cpp

diff --git a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp
index d57360f..01141f8 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp
@@ -214,7 +214,8 @@
 
     if (cardStatus.cardState == CardState::ABSENT) {
         ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE ||
-                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);
+                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
+                    radioRsp->rspInfo.error == RadioError::NONE);
     }
 }
 
@@ -488,4 +489,4 @@
                     radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
                     radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED);
     }
-}
\ No newline at end of file
+}