diff options
author | Shuo Qian | 2017-04-27 18:48:39 -0500 |
---|---|---|
committer | Gerrit Code Review | 2017-04-27 18:48:39 -0500 |
commit | 570b0cbf6a3f16003c550e174280e39132380abd (patch) | |
tree | de06ba5dd3e6a4bd78ff4b2ba8743481ded0e691 | |
parent | 9ebee6d5b42f48b5db9fc67ebfd6828a6b673dd8 (diff) | |
parent | d90c3242439f277962b96cdb77370763fc30861e (diff) | |
download | platform-hardware-interfaces-570b0cbf6a3f16003c550e174280e39132380abd.tar.gz platform-hardware-interfaces-570b0cbf6a3f16003c550e174280e39132380abd.tar.xz platform-hardware-interfaces-570b0cbf6a3f16003c550e174280e39132380abd.zip |
Merge "Fix Vts errors"
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp | 23 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_data.cpp | 19 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_icc.cpp | 4 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_ims.cpp | 35 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | 54 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_sms.cpp | 91 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_test.cpp | 13 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_utils.h | 8 | ||||
-rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_voice.cpp | 174 |
9 files changed, 254 insertions, 167 deletions
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp b/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp index 53d1b90a..bbca9e40 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp | |||
@@ -75,7 +75,10 @@ TEST_F(RadioHidlTest, setGsmBroadcastConfig) { | |||
75 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 75 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
76 | 76 | ||
77 | if (cardStatus.cardState == CardState::ABSENT) { | 77 | if (cardStatus.cardState == CardState::ABSENT) { |
78 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 78 | ASSERT_TRUE(CheckGeneralError() || |
79 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
80 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | ||
81 | radioRsp->rspInfo.error == RadioError::NONE); | ||
79 | } | 82 | } |
80 | } | 83 | } |
81 | 84 | ||
@@ -92,7 +95,9 @@ TEST_F(RadioHidlTest, getGsmBroadcastConfig) { | |||
92 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 95 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
93 | 96 | ||
94 | if (cardStatus.cardState == CardState::ABSENT) { | 97 | if (cardStatus.cardState == CardState::ABSENT) { |
95 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 98 | ASSERT_TRUE(CheckGeneralError() || |
99 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | ||
100 | radioRsp->rspInfo.error == RadioError::NONE); | ||
96 | } | 101 | } |
97 | } | 102 | } |
98 | 103 | ||
@@ -117,7 +122,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) { | |||
117 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 122 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
118 | 123 | ||
119 | if (cardStatus.cardState == CardState::ABSENT) { | 124 | if (cardStatus.cardState == CardState::ABSENT) { |
120 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 125 | ASSERT_TRUE(CheckGeneralError() || |
126 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); | ||
121 | } | 127 | } |
122 | } | 128 | } |
123 | 129 | ||
@@ -134,7 +140,7 @@ TEST_F(RadioHidlTest, getCdmaBroadcastConfig) { | |||
134 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 140 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
135 | 141 | ||
136 | if (cardStatus.cardState == CardState::ABSENT) { | 142 | if (cardStatus.cardState == CardState::ABSENT) { |
137 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 143 | ASSERT_TRUE(CheckGeneralError()); |
138 | } | 144 | } |
139 | } | 145 | } |
140 | 146 | ||
@@ -152,7 +158,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastActivation) { | |||
152 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 158 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
153 | 159 | ||
154 | if (cardStatus.cardState == CardState::ABSENT) { | 160 | if (cardStatus.cardState == CardState::ABSENT) { |
155 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 161 | ASSERT_TRUE(CheckGeneralError() || |
162 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); | ||
156 | } | 163 | } |
157 | } | 164 | } |
158 | 165 | ||
@@ -170,6 +177,10 @@ TEST_F(RadioHidlTest, setGsmBroadcastActivation) { | |||
170 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 177 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
171 | 178 | ||
172 | if (cardStatus.cardState == CardState::ABSENT) { | 179 | if (cardStatus.cardState == CardState::ABSENT) { |
173 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 180 | ASSERT_TRUE(CheckGeneralError() || |
181 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
182 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | ||
183 | radioRsp->rspInfo.error == RadioError::NONE || | ||
184 | radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); | ||
174 | } | 185 | } |
175 | } | 186 | } |
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp index 526cb047..4eeabe84 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp | |||
@@ -75,7 +75,13 @@ TEST_F(RadioHidlTest, setupDataCall) { | |||
75 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 75 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
76 | 76 | ||
77 | if (cardStatus.cardState == CardState::ABSENT) { | 77 | if (cardStatus.cardState == CardState::ABSENT) { |
78 | ASSERT_FALSE(RadioError::NONE == radioRsp->rspInfo.error); | 78 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || |
79 | radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || | ||
80 | radioRsp->rspInfo.error == | ||
81 | RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW || | ||
82 | radioRsp->rspInfo.error == | ||
83 | RadioError::OP_NOT_ALLOWED_DURING_VOICE_CALL || | ||
84 | CheckOEMError()); | ||
79 | } | 85 | } |
80 | } | 86 | } |
81 | 87 | ||
@@ -94,7 +100,7 @@ TEST_F(RadioHidlTest, deactivateDataCall) { | |||
94 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 100 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
95 | 101 | ||
96 | if (cardStatus.cardState == CardState::ABSENT) { | 102 | if (cardStatus.cardState == CardState::ABSENT) { |
97 | EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); | 103 | EXPECT_EQ(RadioError::INVALID_CALL_ID, radioRsp->rspInfo.error); |
98 | } | 104 | } |
99 | } | 105 | } |
100 | 106 | ||
@@ -111,7 +117,8 @@ TEST_F(RadioHidlTest, getDataCallList) { | |||
111 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 117 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
112 | 118 | ||
113 | if (cardStatus.cardState == CardState::ABSENT) { | 119 | if (cardStatus.cardState == CardState::ABSENT) { |
114 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 120 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || |
121 | radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE); | ||
115 | } | 122 | } |
116 | } | 123 | } |
117 | 124 | ||
@@ -152,7 +159,11 @@ TEST_F(RadioHidlTest, setInitialAttachApn) { | |||
152 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 159 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
153 | 160 | ||
154 | if (cardStatus.cardState == CardState::ABSENT) { | 161 | if (cardStatus.cardState == CardState::ABSENT) { |
155 | ASSERT_FALSE(RadioError::NONE == radioRsp->rspInfo.error); | 162 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || |
163 | radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || | ||
164 | radioRsp->rspInfo.error == | ||
165 | RadioError::SUBSCRIPTION_NOT_AVAILABLE || | ||
166 | CheckOEMError()); | ||
156 | } | 167 | } |
157 | } | 168 | } |
158 | 169 | ||
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp index 107feb40..1547c33b 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp | |||
@@ -316,6 +316,8 @@ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) { | |||
316 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 316 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
317 | 317 | ||
318 | if (cardStatus.cardState == CardState::ABSENT) { | 318 | if (cardStatus.cardState == CardState::ABSENT) { |
319 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT); | 319 | ASSERT_TRUE(CheckGeneralError() || |
320 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
321 | radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT); | ||
320 | } | 322 | } |
321 | } | 323 | } |
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp index 0ec2e5c0..ddf6b7ee 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp | |||
@@ -31,9 +31,8 @@ TEST_F(RadioHidlTest, getClir) { | |||
31 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 31 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
32 | 32 | ||
33 | if (cardStatus.cardState == CardState::ABSENT) { | 33 | if (cardStatus.cardState == CardState::ABSENT) { |
34 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 34 | ASSERT_TRUE(CheckGeneralError() || |
35 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 35 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
36 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | ||
37 | } | 36 | } |
38 | } | 37 | } |
39 | 38 | ||
@@ -73,10 +72,9 @@ TEST_F(RadioHidlTest, getFacilityLockForApp) { | |||
73 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 72 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
74 | 73 | ||
75 | if (cardStatus.cardState == CardState::ABSENT) { | 74 | if (cardStatus.cardState == CardState::ABSENT) { |
76 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 75 | ASSERT_TRUE(CheckGeneralError() || |
77 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 76 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
78 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 77 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
79 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | ||
80 | } | 78 | } |
81 | } | 79 | } |
82 | 80 | ||
@@ -99,10 +97,9 @@ TEST_F(RadioHidlTest, setFacilityLockForApp) { | |||
99 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 97 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
100 | 98 | ||
101 | if (cardStatus.cardState == CardState::ABSENT) { | 99 | if (cardStatus.cardState == CardState::ABSENT) { |
102 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 100 | ASSERT_TRUE(CheckGeneralError() || |
103 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 101 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
104 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 102 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
105 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | ||
106 | } | 103 | } |
107 | } | 104 | } |
108 | 105 | ||
@@ -122,10 +119,11 @@ TEST_F(RadioHidlTest, setBarringPassword) { | |||
122 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 119 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
123 | 120 | ||
124 | if (cardStatus.cardState == CardState::ABSENT) { | 121 | if (cardStatus.cardState == CardState::ABSENT) { |
125 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 122 | ASSERT_TRUE(CheckGeneralError() || |
126 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 123 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
127 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 124 | radioRsp->rspInfo.error == RadioError::NONE || |
128 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 125 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || |
126 | radioRsp->rspInfo.error == RadioError::FDN_CHECK_FAILURE); | ||
129 | } | 127 | } |
130 | } | 128 | } |
131 | 129 | ||
@@ -142,9 +140,8 @@ TEST_F(RadioHidlTest, getClip) { | |||
142 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 140 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
143 | 141 | ||
144 | if (cardStatus.cardState == CardState::ABSENT) { | 142 | if (cardStatus.cardState == CardState::ABSENT) { |
145 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 143 | ASSERT_TRUE(CheckGeneralError() || |
146 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 144 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
147 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | ||
148 | } | 145 | } |
149 | } | 146 | } |
150 | 147 | ||
@@ -180,7 +177,7 @@ TEST_F(RadioHidlTest, requestIsimAuthentication) { | |||
180 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 177 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
181 | 178 | ||
182 | if (cardStatus.cardState == CardState::ABSENT) { | 179 | if (cardStatus.cardState == CardState::ABSENT) { |
183 | EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); | 180 | ASSERT_TRUE(CheckGeneralError()); |
184 | } | 181 | } |
185 | } | 182 | } |
186 | 183 | ||
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp index 5515b8d2..6879c90f 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | |||
@@ -108,7 +108,10 @@ TEST_F(RadioHidlTest, setNetworkSelectionModeAutomatic) { | |||
108 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 108 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
109 | 109 | ||
110 | if (cardStatus.cardState == CardState::ABSENT) { | 110 | if (cardStatus.cardState == CardState::ABSENT) { |
111 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME); | 111 | ASSERT_TRUE(CheckGeneralError() || |
112 | radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME || | ||
113 | radioRsp->rspInfo.error == RadioError::NONE || | ||
114 | radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); | ||
112 | } | 115 | } |
113 | } | 116 | } |
114 | 117 | ||
@@ -124,7 +127,11 @@ TEST_F(RadioHidlTest, setNetworkSelectionModeManual) { | |||
124 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 127 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
125 | 128 | ||
126 | if (cardStatus.cardState == CardState::ABSENT) { | 129 | if (cardStatus.cardState == CardState::ABSENT) { |
127 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME); | 130 | ASSERT_TRUE(CheckGeneralError() || |
131 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
132 | radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME || | ||
133 | radioRsp->rspInfo.error == RadioError::NONE || | ||
134 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | ||
128 | } | 135 | } |
129 | } | 136 | } |
130 | 137 | ||
@@ -140,7 +147,11 @@ TEST_F(RadioHidlTest, getAvailableNetworks) { | |||
140 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 147 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
141 | 148 | ||
142 | if (cardStatus.cardState == CardState::ABSENT) { | 149 | if (cardStatus.cardState == CardState::ABSENT) { |
143 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 150 | ASSERT_TRUE(CheckGeneralError() || |
151 | radioRsp->rspInfo.error == RadioError::NONE || | ||
152 | radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE || | ||
153 | radioRsp->rspInfo.error == RadioError::CANCELLED || | ||
154 | radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); | ||
144 | } | 155 | } |
145 | } | 156 | } |
146 | 157 | ||
@@ -284,7 +295,9 @@ TEST_F(RadioHidlTest, getCdmaRoamingPreference) { | |||
284 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 295 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
285 | 296 | ||
286 | if (cardStatus.cardState == CardState::ABSENT) { | 297 | if (cardStatus.cardState == CardState::ABSENT) { |
287 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 298 | ASSERT_TRUE(CheckGeneralError() || |
299 | radioRsp->rspInfo.error == RadioError::NONE || | ||
300 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); | ||
288 | } | 301 | } |
289 | } | 302 | } |
290 | 303 | ||
@@ -462,7 +475,9 @@ TEST_F(RadioHidlTest, getCellInfoList) { | |||
462 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 475 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
463 | 476 | ||
464 | if (cardStatus.cardState == CardState::ABSENT) { | 477 | if (cardStatus.cardState == CardState::ABSENT) { |
465 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 478 | ASSERT_TRUE(CheckGeneralError() || |
479 | radioRsp->rspInfo.error == RadioError::NONE || | ||
480 | radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND); | ||
466 | } | 481 | } |
467 | } | 482 | } |
468 | 483 | ||
@@ -565,7 +580,12 @@ TEST_F(RadioHidlTest, setUiccSubscription) { | |||
565 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 580 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
566 | 581 | ||
567 | if (cardStatus.cardState == CardState::ABSENT) { | 582 | if (cardStatus.cardState == CardState::ABSENT) { |
568 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 583 | ASSERT_TRUE(CheckGeneralError() || |
584 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
585 | radioRsp->rspInfo.error == RadioError::NONE || | ||
586 | radioRsp->rspInfo.error == | ||
587 | RadioError::SUBSCRIPTION_NOT_SUPPORTED || | ||
588 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); | ||
569 | } | 589 | } |
570 | } | 590 | } |
571 | 591 | ||
@@ -597,7 +617,8 @@ TEST_F(RadioHidlTest, requestShutdown) { | |||
597 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 617 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
598 | 618 | ||
599 | if (cardStatus.cardState == CardState::ABSENT) { | 619 | if (cardStatus.cardState == CardState::ABSENT) { |
600 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 620 | ASSERT_TRUE(CheckGeneralError() || |
621 | radioRsp->rspInfo.error == RadioError::NONE); | ||
601 | } | 622 | } |
602 | } | 623 | } |
603 | 624 | ||
@@ -632,7 +653,9 @@ TEST_F(RadioHidlTest, setRadioCapability) { | |||
632 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 653 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
633 | 654 | ||
634 | if (cardStatus.cardState == CardState::ABSENT) { | 655 | if (cardStatus.cardState == CardState::ABSENT) { |
635 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 656 | ASSERT_TRUE(CheckGeneralError() || |
657 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
658 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | ||
636 | } | 659 | } |
637 | } | 660 | } |
638 | 661 | ||
@@ -648,8 +671,9 @@ TEST_F(RadioHidlTest, startLceService) { | |||
648 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 671 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
649 | 672 | ||
650 | if (cardStatus.cardState == CardState::ABSENT) { | 673 | if (cardStatus.cardState == CardState::ABSENT) { |
651 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || | 674 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || |
652 | radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED); | 675 | radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED || |
676 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | ||
653 | } | 677 | } |
654 | } | 678 | } |
655 | 679 | ||
@@ -682,8 +706,8 @@ TEST_F(RadioHidlTest, pullLceData) { | |||
682 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 706 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
683 | 707 | ||
684 | if (cardStatus.cardState == CardState::ABSENT) { | 708 | if (cardStatus.cardState == CardState::ABSENT) { |
685 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || | 709 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || |
686 | radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED); | 710 | CheckOEMError()); |
687 | } | 711 | } |
688 | } | 712 | } |
689 | 713 | ||
@@ -755,7 +779,8 @@ TEST_F(RadioHidlTest, sendDeviceState) { | |||
755 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 779 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
756 | 780 | ||
757 | if (cardStatus.cardState == CardState::ABSENT) { | 781 | if (cardStatus.cardState == CardState::ABSENT) { |
758 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 782 | ASSERT_TRUE(CheckGeneralError() || |
783 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); | ||
759 | } | 784 | } |
760 | } | 785 | } |
761 | 786 | ||
@@ -771,7 +796,8 @@ TEST_F(RadioHidlTest, setIndicationFilter) { | |||
771 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 796 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
772 | 797 | ||
773 | if (cardStatus.cardState == CardState::ABSENT) { | 798 | if (cardStatus.cardState == CardState::ABSENT) { |
774 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 799 | ASSERT_TRUE(CheckGeneralError() || |
800 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); | ||
775 | } | 801 | } |
776 | } | 802 | } |
777 | 803 | ||
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp b/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp index 7caf4712..b8a50c0c 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp | |||
@@ -34,11 +34,10 @@ TEST_F(RadioHidlTest, sendSms) { | |||
34 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 34 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
35 | 35 | ||
36 | if (cardStatus.cardState == CardState::ABSENT) { | 36 | if (cardStatus.cardState == CardState::ABSENT) { |
37 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 37 | ASSERT_TRUE(CheckGeneralError() || |
38 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 38 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
39 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 39 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); |
40 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | 40 | EXPECT_EQ(0, radioRsp->sendSmsResult.errorCode); |
41 | EXPECT_EQ(0, radioRsp->sendSmsResult.errorCode); | ||
42 | } | 41 | } |
43 | } | 42 | } |
44 | 43 | ||
@@ -61,10 +60,9 @@ TEST_F(RadioHidlTest, sendSMSExpectMore) { | |||
61 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 60 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
62 | 61 | ||
63 | if (cardStatus.cardState == CardState::ABSENT) { | 62 | if (cardStatus.cardState == CardState::ABSENT) { |
64 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 63 | ASSERT_TRUE(CheckGeneralError() || |
65 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 64 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
66 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 65 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); |
67 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | ||
68 | } | 66 | } |
69 | } | 67 | } |
70 | 68 | ||
@@ -83,7 +81,9 @@ TEST_F(RadioHidlTest, acknowledgeLastIncomingGsmSms) { | |||
83 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 81 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
84 | 82 | ||
85 | if (cardStatus.cardState == CardState::ABSENT) { | 83 | if (cardStatus.cardState == CardState::ABSENT) { |
86 | EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); | 84 | ASSERT_TRUE(CheckGeneralError() || |
85 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
86 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | ||
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||
@@ -144,10 +144,9 @@ TEST_F(RadioHidlTest, sendCdmaSms) { | |||
144 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 144 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
145 | 145 | ||
146 | if (cardStatus.cardState == CardState::ABSENT) { | 146 | if (cardStatus.cardState == CardState::ABSENT) { |
147 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 147 | ASSERT_TRUE(CheckGeneralError() || |
148 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 148 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
149 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 149 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); |
150 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | ||
151 | } | 150 | } |
152 | } | 151 | } |
153 | 152 | ||
@@ -169,7 +168,9 @@ TEST_F(RadioHidlTest, acknowledgeLastIncomingCdmaSms) { | |||
169 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 168 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
170 | 169 | ||
171 | if (cardStatus.cardState == CardState::ABSENT) { | 170 | if (cardStatus.cardState == CardState::ABSENT) { |
172 | EXPECT_EQ(RadioError::NO_SMS_TO_ACK, radioRsp->rspInfo.error); | 171 | ASSERT_TRUE(CheckGeneralError() || |
172 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
173 | radioRsp->rspInfo.error == RadioError::NO_SMS_TO_ACK); | ||
173 | } | 174 | } |
174 | } | 175 | } |
175 | 176 | ||
@@ -219,7 +220,8 @@ TEST_F(RadioHidlTest, sendImsSms) { | |||
219 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 220 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
220 | 221 | ||
221 | if (cardStatus.cardState == CardState::ABSENT) { | 222 | if (cardStatus.cardState == CardState::ABSENT) { |
222 | EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); | 223 | ASSERT_TRUE(CheckGeneralError() || |
224 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); | ||
223 | } | 225 | } |
224 | } | 226 | } |
225 | 227 | ||
@@ -236,11 +238,9 @@ TEST_F(RadioHidlTest, getSmscAddress) { | |||
236 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 238 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
237 | 239 | ||
238 | if (cardStatus.cardState == CardState::ABSENT) { | 240 | if (cardStatus.cardState == CardState::ABSENT) { |
239 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 241 | ASSERT_TRUE(CheckGeneralError() || |
240 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 242 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
241 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 243 | radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); |
242 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | ||
243 | radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); | ||
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
@@ -258,7 +258,9 @@ TEST_F(RadioHidlTest, setSmscAddress) { | |||
258 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 258 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
259 | 259 | ||
260 | if (cardStatus.cardState == CardState::ABSENT) { | 260 | if (cardStatus.cardState == CardState::ABSENT) { |
261 | EXPECT_EQ(RadioError::INVALID_SMS_FORMAT, radioRsp->rspInfo.error); | 261 | ASSERT_TRUE(CheckGeneralError() || |
262 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | ||
263 | radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT); | ||
262 | } | 264 | } |
263 | } | 265 | } |
264 | 266 | ||
@@ -279,10 +281,14 @@ TEST_F(RadioHidlTest, writeSmsToSim) { | |||
279 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 281 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
280 | 282 | ||
281 | if (cardStatus.cardState == CardState::ABSENT) { | 283 | if (cardStatus.cardState == CardState::ABSENT) { |
282 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 284 | ASSERT_TRUE(CheckGeneralError() || |
283 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 285 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
284 | radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || | 286 | radioRsp->rspInfo.error == RadioError::NONE || |
285 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 287 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || |
288 | radioRsp->rspInfo.error == RadioError::ENCODING_ERR || | ||
289 | radioRsp->rspInfo.error == RadioError::NO_RESOURCES || | ||
290 | radioRsp->rspInfo.error == RadioError::NETWORK_NOT_READY || | ||
291 | radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS); | ||
286 | } | 292 | } |
287 | } | 293 | } |
288 | 294 | ||
@@ -300,10 +306,11 @@ TEST_F(RadioHidlTest, deleteSmsOnSim) { | |||
300 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 306 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
301 | 307 | ||
302 | if (cardStatus.cardState == CardState::ABSENT) { | 308 | if (cardStatus.cardState == CardState::ABSENT) { |
303 | EXPECT_EQ(RadioError::INVALID_SMS_FORMAT, radioRsp->rspInfo.error); | 309 | ASSERT_TRUE(CheckGeneralError() || |
304 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 310 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
305 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 311 | radioRsp->rspInfo.error == RadioError::NONE || |
306 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR); | 312 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || |
313 | radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY); | ||
307 | } | 314 | } |
308 | } | 315 | } |
309 | 316 | ||
@@ -350,10 +357,14 @@ TEST_F(RadioHidlTest, writeSmsToRuim) { | |||
350 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 357 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
351 | 358 | ||
352 | if (cardStatus.cardState == CardState::ABSENT) { | 359 | if (cardStatus.cardState == CardState::ABSENT) { |
353 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 360 | ASSERT_TRUE(CheckGeneralError() || |
354 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 361 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
355 | radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || | 362 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
356 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 363 | radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT || |
364 | radioRsp->rspInfo.error == RadioError::NONE || | ||
365 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | ||
366 | radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY || | ||
367 | radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS); | ||
357 | } | 368 | } |
358 | } | 369 | } |
359 | 370 | ||
@@ -401,9 +412,7 @@ TEST_F(RadioHidlTest, deleteSmsOnRuim) { | |||
401 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 412 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
402 | 413 | ||
403 | if (cardStatus.cardState == CardState::ABSENT) { | 414 | if (cardStatus.cardState == CardState::ABSENT) { |
404 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 415 | ASSERT_TRUE(CheckGeneralError()); |
405 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | ||
406 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR); | ||
407 | } | 416 | } |
408 | } | 417 | } |
409 | 418 | ||
@@ -421,9 +430,9 @@ TEST_F(RadioHidlTest, reportSmsMemoryStatus) { | |||
421 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 430 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
422 | 431 | ||
423 | if (cardStatus.cardState == CardState::ABSENT) { | 432 | if (cardStatus.cardState == CardState::ABSENT) { |
424 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 433 | ASSERT_TRUE(CheckGeneralError() || |
425 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 434 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
426 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 435 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
427 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | 436 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
428 | } | 437 | } |
429 | } | 438 | } |
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp index d40f15aa..794c60f2 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp | |||
@@ -58,3 +58,16 @@ std::cv_status RadioHidlTest::wait() { | |||
58 | count--; | 58 | count--; |
59 | return status; | 59 | return status; |
60 | } | 60 | } |
61 | |||
62 | bool RadioHidlTest::CheckGeneralError() { | ||
63 | return (radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || | ||
64 | radioRsp->rspInfo.error == RadioError::NO_MEMORY || | ||
65 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || | ||
66 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | ||
67 | radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); | ||
68 | } | ||
69 | |||
70 | bool RadioHidlTest::CheckOEMError() { | ||
71 | return (radioRsp->rspInfo.error >= RadioError::OEM_ERROR_1 && | ||
72 | radioRsp->rspInfo.error <= RadioError::OEM_ERROR_25); | ||
73 | } \ No newline at end of file | ||
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils.h b/radio/1.0/vts/functional/radio_hidl_hal_utils.h index 51db87b0..735e5759 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_utils.h +++ b/radio/1.0/vts/functional/radio_hidl_hal_utils.h | |||
@@ -500,6 +500,12 @@ class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
500 | /* Test code calls this function to wait for response */ | 500 | /* Test code calls this function to wait for response */ |
501 | std::cv_status wait(); | 501 | std::cv_status wait(); |
502 | 502 | ||
503 | /* Used for checking General Errors */ | ||
504 | bool CheckGeneralError(); | ||
505 | |||
506 | /* Used for checking OEM Errors */ | ||
507 | bool CheckOEMError(); | ||
508 | |||
503 | sp<IRadio> radio; | 509 | sp<IRadio> radio; |
504 | sp<RadioResponse> radioRsp; | 510 | sp<RadioResponse> radioRsp; |
505 | sp<IRadioIndication> radioInd; | 511 | sp<IRadioIndication> radioInd; |
@@ -510,4 +516,4 @@ class RadioHidlEnvironment : public ::testing::Environment { | |||
510 | public: | 516 | public: |
511 | virtual void SetUp() {} | 517 | virtual void SetUp() {} |
512 | virtual void TearDown() {} | 518 | virtual void TearDown() {} |
513 | }; | 519 | }; \ No newline at end of file |
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 ef10d101..b96269a3 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp | |||
@@ -48,10 +48,18 @@ TEST_F(RadioHidlTest, dial) { | |||
48 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 48 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
49 | 49 | ||
50 | if (cardStatus.cardState == CardState::ABSENT) { | 50 | if (cardStatus.cardState == CardState::ABSENT) { |
51 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 51 | ASSERT_TRUE(CheckGeneralError() || |
52 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 52 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
53 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 53 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
54 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 54 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || |
55 | radioRsp->rspInfo.error == RadioError::FDN_CHECK_FAILURE || | ||
56 | radioRsp->rspInfo.error == RadioError::NO_SUBSCRIPTION || | ||
57 | radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND || | ||
58 | radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || | ||
59 | radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE || | ||
60 | radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED || | ||
61 | radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || | ||
62 | radioRsp->rspInfo.error == RadioError::CANCELLED); | ||
55 | } | 63 | } |
56 | } | 64 | } |
57 | 65 | ||
@@ -67,10 +75,10 @@ TEST_F(RadioHidlTest, hangup) { | |||
67 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 75 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
68 | 76 | ||
69 | if (cardStatus.cardState == CardState::ABSENT) { | 77 | if (cardStatus.cardState == CardState::ABSENT) { |
70 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 78 | ASSERT_TRUE(CheckGeneralError() || |
71 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 79 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
72 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 80 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
73 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 81 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
74 | } | 82 | } |
75 | } | 83 | } |
76 | 84 | ||
@@ -86,9 +94,9 @@ TEST_F(RadioHidlTest, hangupWaitingOrBackground) { | |||
86 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 94 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
87 | 95 | ||
88 | if (cardStatus.cardState == CardState::ABSENT) { | 96 | if (cardStatus.cardState == CardState::ABSENT) { |
89 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 97 | ASSERT_TRUE(CheckGeneralError() || |
90 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 98 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
91 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 99 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
92 | } | 100 | } |
93 | } | 101 | } |
94 | 102 | ||
@@ -104,9 +112,9 @@ TEST_F(RadioHidlTest, hangupForegroundResumeBackground) { | |||
104 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 112 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
105 | 113 | ||
106 | if (cardStatus.cardState == CardState::ABSENT) { | 114 | if (cardStatus.cardState == CardState::ABSENT) { |
107 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 115 | ASSERT_TRUE(CheckGeneralError() || |
108 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 116 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
109 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 117 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
110 | } | 118 | } |
111 | } | 119 | } |
112 | 120 | ||
@@ -122,9 +130,9 @@ TEST_F(RadioHidlTest, switchWaitingOrHoldingAndActive) { | |||
122 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 130 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
123 | 131 | ||
124 | if (cardStatus.cardState == CardState::ABSENT) { | 132 | if (cardStatus.cardState == CardState::ABSENT) { |
125 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 133 | ASSERT_TRUE(CheckGeneralError() || |
126 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 134 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
127 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 135 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
128 | } | 136 | } |
129 | } | 137 | } |
130 | 138 | ||
@@ -140,9 +148,9 @@ TEST_F(RadioHidlTest, conference) { | |||
140 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 148 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
141 | 149 | ||
142 | if (cardStatus.cardState == CardState::ABSENT) { | 150 | if (cardStatus.cardState == CardState::ABSENT) { |
143 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 151 | ASSERT_TRUE(CheckGeneralError() || |
144 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 152 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
145 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 153 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
146 | } | 154 | } |
147 | } | 155 | } |
148 | 156 | ||
@@ -158,9 +166,9 @@ TEST_F(RadioHidlTest, rejectCall) { | |||
158 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 166 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
159 | 167 | ||
160 | if (cardStatus.cardState == CardState::ABSENT) { | 168 | if (cardStatus.cardState == CardState::ABSENT) { |
161 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 169 | ASSERT_TRUE(CheckGeneralError() || |
162 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 170 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
163 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 171 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
164 | } | 172 | } |
165 | } | 173 | } |
166 | 174 | ||
@@ -176,7 +184,8 @@ TEST_F(RadioHidlTest, getLastCallFailCause) { | |||
176 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 184 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
177 | 185 | ||
178 | if (cardStatus.cardState == CardState::ABSENT) { | 186 | if (cardStatus.cardState == CardState::ABSENT) { |
179 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); | 187 | ASSERT_TRUE(CheckGeneralError() || |
188 | radioRsp->rspInfo.error == RadioError::NONE); | ||
180 | } | 189 | } |
181 | } | 190 | } |
182 | 191 | ||
@@ -191,11 +200,10 @@ TEST_F(RadioHidlTest, sendUssd) { | |||
191 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 200 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
192 | 201 | ||
193 | if (cardStatus.cardState == CardState::ABSENT) { | 202 | if (cardStatus.cardState == CardState::ABSENT) { |
194 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 203 | ASSERT_TRUE(CheckGeneralError() || |
195 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 204 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
196 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 205 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
197 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 206 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
198 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | ||
199 | } | 207 | } |
200 | } | 208 | } |
201 | 209 | ||
@@ -211,9 +219,9 @@ TEST_F(RadioHidlTest, cancelPendingUssd) { | |||
211 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 219 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
212 | 220 | ||
213 | if (cardStatus.cardState == CardState::ABSENT) { | 221 | if (cardStatus.cardState == CardState::ABSENT) { |
214 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 222 | ASSERT_TRUE(CheckGeneralError() || |
215 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 223 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
216 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 224 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
217 | } | 225 | } |
218 | } | 226 | } |
219 | 227 | ||
@@ -232,10 +240,10 @@ TEST_F(RadioHidlTest, getCallForwardStatus) { | |||
232 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 240 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
233 | 241 | ||
234 | if (cardStatus.cardState == CardState::ABSENT) { | 242 | if (cardStatus.cardState == CardState::ABSENT) { |
235 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 243 | ASSERT_TRUE(CheckGeneralError() || |
236 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 244 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
237 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 245 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
238 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 246 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
239 | } | 247 | } |
240 | } | 248 | } |
241 | 249 | ||
@@ -254,10 +262,10 @@ TEST_F(RadioHidlTest, setCallForward) { | |||
254 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 262 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
255 | 263 | ||
256 | if (cardStatus.cardState == CardState::ABSENT) { | 264 | if (cardStatus.cardState == CardState::ABSENT) { |
257 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 265 | ASSERT_TRUE(CheckGeneralError() || |
258 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 266 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
259 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 267 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
260 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 268 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
261 | } | 269 | } |
262 | } | 270 | } |
263 | 271 | ||
@@ -273,10 +281,10 @@ TEST_F(RadioHidlTest, getCallWaiting) { | |||
273 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 281 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
274 | 282 | ||
275 | if (cardStatus.cardState == CardState::ABSENT) { | 283 | if (cardStatus.cardState == CardState::ABSENT) { |
276 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 284 | ASSERT_TRUE(CheckGeneralError() || |
277 | radioRsp->rspInfo.error == RadioError::NONE || | 285 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
278 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 286 | radioRsp->rspInfo.error == RadioError::NONE || |
279 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 287 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
280 | } | 288 | } |
281 | } | 289 | } |
282 | 290 | ||
@@ -292,10 +300,10 @@ TEST_F(RadioHidlTest, setCallWaiting) { | |||
292 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 300 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
293 | 301 | ||
294 | if (cardStatus.cardState == CardState::ABSENT) { | 302 | if (cardStatus.cardState == CardState::ABSENT) { |
295 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 303 | ASSERT_TRUE(CheckGeneralError() || |
296 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 304 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
297 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 305 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
298 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 306 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
299 | } | 307 | } |
300 | } | 308 | } |
301 | 309 | ||
@@ -311,9 +319,9 @@ TEST_F(RadioHidlTest, acceptCall) { | |||
311 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 319 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
312 | 320 | ||
313 | if (cardStatus.cardState == CardState::ABSENT) { | 321 | if (cardStatus.cardState == CardState::ABSENT) { |
314 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 322 | ASSERT_TRUE(CheckGeneralError() || |
315 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 323 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
316 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 324 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
317 | } | 325 | } |
318 | } | 326 | } |
319 | 327 | ||
@@ -329,11 +337,10 @@ TEST_F(RadioHidlTest, separateConnection) { | |||
329 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 337 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
330 | 338 | ||
331 | if (cardStatus.cardState == CardState::ABSENT) { | 339 | if (cardStatus.cardState == CardState::ABSENT) { |
332 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 340 | ASSERT_TRUE(CheckGeneralError() || |
333 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 341 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
334 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 342 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
335 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 343 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
336 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | ||
337 | } | 344 | } |
338 | } | 345 | } |
339 | 346 | ||
@@ -349,9 +356,9 @@ TEST_F(RadioHidlTest, explicitCallTransfer) { | |||
349 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 356 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
350 | 357 | ||
351 | if (cardStatus.cardState == CardState::ABSENT) { | 358 | if (cardStatus.cardState == CardState::ABSENT) { |
352 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 359 | ASSERT_TRUE(CheckGeneralError() || |
353 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 360 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
354 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 361 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
355 | } | 362 | } |
356 | } | 363 | } |
357 | 364 | ||
@@ -367,11 +374,12 @@ TEST_F(RadioHidlTest, sendCDMAFeatureCode) { | |||
367 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 374 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
368 | 375 | ||
369 | if (cardStatus.cardState == CardState::ABSENT) { | 376 | if (cardStatus.cardState == CardState::ABSENT) { |
370 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 377 | ASSERT_TRUE(CheckGeneralError() || |
371 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || | 378 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
372 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 379 | radioRsp->rspInfo.error == RadioError::NONE || |
373 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || | 380 | radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || |
374 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR); | 381 | radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || |
382 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); | ||
375 | } | 383 | } |
376 | } | 384 | } |
377 | 385 | ||
@@ -387,9 +395,11 @@ TEST_F(RadioHidlTest, sendDtmf) { | |||
387 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 395 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
388 | 396 | ||
389 | if (cardStatus.cardState == CardState::ABSENT) { | 397 | if (cardStatus.cardState == CardState::ABSENT) { |
390 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 398 | ASSERT_TRUE(CheckGeneralError() || |
391 | radioRsp->rspInfo.error == RadioError::NO_RESOURCES || | 399 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
392 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); | 400 | radioRsp->rspInfo.error == RadioError::NONE || |
401 | radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || | ||
402 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); | ||
393 | } | 403 | } |
394 | } | 404 | } |
395 | 405 | ||
@@ -405,10 +415,11 @@ TEST_F(RadioHidlTest, startDtmf) { | |||
405 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 415 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
406 | 416 | ||
407 | if (cardStatus.cardState == CardState::ABSENT) { | 417 | if (cardStatus.cardState == CardState::ABSENT) { |
408 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 418 | ASSERT_TRUE(CheckGeneralError() || |
409 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 419 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
410 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 420 | radioRsp->rspInfo.error == RadioError::NONE || |
411 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 421 | radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || |
422 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); | ||
412 | } | 423 | } |
413 | } | 424 | } |
414 | 425 | ||
@@ -424,9 +435,10 @@ TEST_F(RadioHidlTest, stopDtmf) { | |||
424 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 435 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
425 | 436 | ||
426 | if (cardStatus.cardState == CardState::ABSENT) { | 437 | if (cardStatus.cardState == CardState::ABSENT) { |
427 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 438 | ASSERT_TRUE(CheckGeneralError() || |
428 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 439 | radioRsp->rspInfo.error == RadioError::NONE || |
429 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); | 440 | radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || |
441 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); | ||
430 | } | 442 | } |
431 | } | 443 | } |
432 | 444 | ||
@@ -442,8 +454,9 @@ TEST_F(RadioHidlTest, setMute) { | |||
442 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 454 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
443 | 455 | ||
444 | if (cardStatus.cardState == CardState::ABSENT) { | 456 | if (cardStatus.cardState == CardState::ABSENT) { |
445 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 457 | ASSERT_TRUE(CheckGeneralError() || |
446 | radioRsp->rspInfo.error == RadioError::NONE); | 458 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
459 | radioRsp->rspInfo.error == RadioError::NONE); | ||
447 | } | 460 | } |
448 | } | 461 | } |
449 | 462 | ||
@@ -475,10 +488,9 @@ TEST_F(RadioHidlTest, sendBurstDtmf) { | |||
475 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); | 488 | EXPECT_EQ(serial, radioRsp->rspInfo.serial); |
476 | 489 | ||
477 | if (cardStatus.cardState == CardState::ABSENT) { | 490 | if (cardStatus.cardState == CardState::ABSENT) { |
478 | ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || | 491 | ASSERT_TRUE(CheckGeneralError() || |
479 | radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || | 492 | radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || |
480 | radioRsp->rspInfo.error == RadioError::MODEM_ERR || | 493 | radioRsp->rspInfo.error == RadioError::INVALID_STATE || |
481 | radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || | 494 | radioRsp->rspInfo.error == RadioError::MODEM_ERR); |
482 | radioRsp->rspInfo.error == RadioError::INVALID_STATE); | ||
483 | } | 495 | } |
484 | } \ No newline at end of file | 496 | } \ No newline at end of file |