summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--radio/1.2/vts/functional/radio_hidl_hal_api.cpp118
-rw-r--r--radio/1.2/vts/functional/radio_hidl_hal_test.cpp15
-rw-r--r--radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h121
-rw-r--r--radio/1.2/vts/functional/radio_indication.cpp29
-rw-r--r--radio/1.2/vts/functional/radio_response.cpp45
5 files changed, 200 insertions, 128 deletions
diff --git a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
index 52318e0c..0febd380 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
@@ -30,10 +30,8 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) {
30 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 30 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
31 .channels = {1,2}}; 31 .channels = {1,2}};
32 32
33 V1_2::NetworkScanRequest request = { 33 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
34 .type = ScanType::ONE_SHOT, 34 .type = ScanType::ONE_SHOT, .interval = 60, .specifiers = {specifier}};
35 .interval = 60,
36 .specifiers = {specifier}};
37 35
38 Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request); 36 Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request);
39 ASSERT_OK(res); 37 ASSERT_OK(res);
@@ -42,9 +40,9 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) {
42 EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial); 40 EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial);
43 41
44 ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); 42 ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str());
45 if (cardStatus.cardState == CardState::ABSENT) { 43 if (cardStatus.base.cardState == CardState::ABSENT) {
46 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::SIM_ABSENT})); 44 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::SIM_ABSENT}));
47 } else if (cardStatus.cardState == CardState::PRESENT) { 45 } else if (cardStatus.base.cardState == CardState::PRESENT) {
48 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); 46 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));
49 } 47 }
50} 48}
@@ -55,9 +53,8 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) {
55TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) { 53TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) {
56 const int serial = GetRandomSerialNumber(); 54 const int serial = GetRandomSerialNumber();
57 55
58 V1_2::NetworkScanRequest request = { 56 ::android::hardware::radio::V1_2::NetworkScanRequest request = {.type = ScanType::ONE_SHOT,
59 .type = ScanType::ONE_SHOT, 57 .interval = 60};
60 .interval = 60};
61 58
62 Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request); 59 Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request);
63 ASSERT_OK(res); 60 ASSERT_OK(res);
@@ -67,10 +64,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) {
67 64
68 ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", 65 ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",
69 toString(radioRsp_v1_2->rspInfo.error).c_str()); 66 toString(radioRsp_v1_2->rspInfo.error).c_str());
70 if (cardStatus.cardState == CardState::ABSENT) { 67 if (cardStatus.base.cardState == CardState::ABSENT) {
71 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 68 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
72 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); 69 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));
73 } else if (cardStatus.cardState == CardState::PRESENT) { 70 } else if (cardStatus.base.cardState == CardState::PRESENT) {
74 ASSERT_TRUE( 71 ASSERT_TRUE(
75 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); 72 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));
76 } 73 }
@@ -87,7 +84,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) {
87 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 84 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
88 .channels = {1,2}}; 85 .channels = {1,2}};
89 86
90 V1_2::NetworkScanRequest request = { 87 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
91 .type = ScanType::ONE_SHOT, 88 .type = ScanType::ONE_SHOT,
92 .interval = 4, 89 .interval = 4,
93 .specifiers = {specifier}, 90 .specifiers = {specifier},
@@ -103,10 +100,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) {
103 100
104 ALOGI("startNetworkScan_InvalidInterval1, rspInfo.error = %s\n", 101 ALOGI("startNetworkScan_InvalidInterval1, rspInfo.error = %s\n",
105 toString(radioRsp_v1_2->rspInfo.error).c_str()); 102 toString(radioRsp_v1_2->rspInfo.error).c_str());
106 if (cardStatus.cardState == CardState::ABSENT) { 103 if (cardStatus.base.cardState == CardState::ABSENT) {
107 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 104 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
108 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); 105 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));
109 } else if (cardStatus.cardState == CardState::PRESENT) { 106 } else if (cardStatus.base.cardState == CardState::PRESENT) {
110 ASSERT_TRUE( 107 ASSERT_TRUE(
111 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); 108 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));
112 } 109 }
@@ -123,7 +120,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) {
123 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 120 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
124 .channels = {1,2}}; 121 .channels = {1,2}};
125 122
126 V1_2::NetworkScanRequest request = { 123 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
127 .type = ScanType::ONE_SHOT, 124 .type = ScanType::ONE_SHOT,
128 .interval = 301, 125 .interval = 301,
129 .specifiers = {specifier}, 126 .specifiers = {specifier},
@@ -139,10 +136,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) {
139 136
140 ALOGI("startNetworkScan_InvalidInterval2, rspInfo.error = %s\n", 137 ALOGI("startNetworkScan_InvalidInterval2, rspInfo.error = %s\n",
141 toString(radioRsp_v1_2->rspInfo.error).c_str()); 138 toString(radioRsp_v1_2->rspInfo.error).c_str());
142 if (cardStatus.cardState == CardState::ABSENT) { 139 if (cardStatus.base.cardState == CardState::ABSENT) {
143 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 140 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
144 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); 141 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));
145 } else if (cardStatus.cardState == CardState::PRESENT) { 142 } else if (cardStatus.base.cardState == CardState::PRESENT) {
146 ASSERT_TRUE( 143 ASSERT_TRUE(
147 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); 144 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));
148 } 145 }
@@ -159,7 +156,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) {
159 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 156 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
160 .channels = {1,2}}; 157 .channels = {1,2}};
161 158
162 V1_2::NetworkScanRequest request = { 159 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
163 .type = ScanType::ONE_SHOT, 160 .type = ScanType::ONE_SHOT,
164 .interval = 60, 161 .interval = 60,
165 .specifiers = {specifier}, 162 .specifiers = {specifier},
@@ -175,10 +172,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) {
175 172
176 ALOGI("startNetworkScan_InvalidMaxSearchTime1, rspInfo.error = %s\n", 173 ALOGI("startNetworkScan_InvalidMaxSearchTime1, rspInfo.error = %s\n",
177 toString(radioRsp_v1_2->rspInfo.error).c_str()); 174 toString(radioRsp_v1_2->rspInfo.error).c_str());
178 if (cardStatus.cardState == CardState::ABSENT) { 175 if (cardStatus.base.cardState == CardState::ABSENT) {
179 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 176 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
180 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); 177 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));
181 } else if (cardStatus.cardState == CardState::PRESENT) { 178 } else if (cardStatus.base.cardState == CardState::PRESENT) {
182 ASSERT_TRUE( 179 ASSERT_TRUE(
183 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); 180 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));
184 } 181 }
@@ -195,7 +192,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) {
195 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 192 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
196 .channels = {1,2}}; 193 .channels = {1,2}};
197 194
198 V1_2::NetworkScanRequest request = { 195 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
199 .type = ScanType::ONE_SHOT, 196 .type = ScanType::ONE_SHOT,
200 .interval = 60, 197 .interval = 60,
201 .specifiers = {specifier}, 198 .specifiers = {specifier},
@@ -211,10 +208,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) {
211 208
212 ALOGI("startNetworkScan_InvalidMaxSearchTime2, rspInfo.error = %s\n", 209 ALOGI("startNetworkScan_InvalidMaxSearchTime2, rspInfo.error = %s\n",
213 toString(radioRsp_v1_2->rspInfo.error).c_str()); 210 toString(radioRsp_v1_2->rspInfo.error).c_str());
214 if (cardStatus.cardState == CardState::ABSENT) { 211 if (cardStatus.base.cardState == CardState::ABSENT) {
215 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 212 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
216 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); 213 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));
217 } else if (cardStatus.cardState == CardState::PRESENT) { 214 } else if (cardStatus.base.cardState == CardState::PRESENT) {
218 ASSERT_TRUE( 215 ASSERT_TRUE(
219 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); 216 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));
220 } 217 }
@@ -231,7 +228,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) {
231 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 228 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
232 .channels = {1,2}}; 229 .channels = {1,2}};
233 230
234 V1_2::NetworkScanRequest request = { 231 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
235 .type = ScanType::ONE_SHOT, 232 .type = ScanType::ONE_SHOT,
236 .interval = 60, 233 .interval = 60,
237 .specifiers = {specifier}, 234 .specifiers = {specifier},
@@ -247,10 +244,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) {
247 244
248 ALOGI("startNetworkScan_InvalidPeriodicity1, rspInfo.error = %s\n", 245 ALOGI("startNetworkScan_InvalidPeriodicity1, rspInfo.error = %s\n",
249 toString(radioRsp_v1_2->rspInfo.error).c_str()); 246 toString(radioRsp_v1_2->rspInfo.error).c_str());
250 if (cardStatus.cardState == CardState::ABSENT) { 247 if (cardStatus.base.cardState == CardState::ABSENT) {
251 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 248 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
252 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); 249 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));
253 } else if (cardStatus.cardState == CardState::PRESENT) { 250 } else if (cardStatus.base.cardState == CardState::PRESENT) {
254 ASSERT_TRUE( 251 ASSERT_TRUE(
255 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); 252 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));
256 } 253 }
@@ -267,7 +264,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) {
267 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 264 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
268 .channels = {1,2}}; 265 .channels = {1,2}};
269 266
270 V1_2::NetworkScanRequest request = { 267 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
271 .type = ScanType::ONE_SHOT, 268 .type = ScanType::ONE_SHOT,
272 .interval = 60, 269 .interval = 60,
273 .specifiers = {specifier}, 270 .specifiers = {specifier},
@@ -283,10 +280,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) {
283 280
284 ALOGI("startNetworkScan_InvalidPeriodicity2, rspInfo.error = %s\n", 281 ALOGI("startNetworkScan_InvalidPeriodicity2, rspInfo.error = %s\n",
285 toString(radioRsp_v1_2->rspInfo.error).c_str()); 282 toString(radioRsp_v1_2->rspInfo.error).c_str());
286 if (cardStatus.cardState == CardState::ABSENT) { 283 if (cardStatus.base.cardState == CardState::ABSENT) {
287 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 284 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
288 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); 285 {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));
289 } else if (cardStatus.cardState == CardState::PRESENT) { 286 } else if (cardStatus.base.cardState == CardState::PRESENT) {
290 ASSERT_TRUE( 287 ASSERT_TRUE(
291 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); 288 CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));
292 } 289 }
@@ -303,7 +300,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) {
303 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 300 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
304 .channels = {1,2}}; 301 .channels = {1,2}};
305 302
306 V1_2::NetworkScanRequest request = { 303 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
307 .type = ScanType::ONE_SHOT, 304 .type = ScanType::ONE_SHOT,
308 .interval = 60, 305 .interval = 60,
309 .specifiers = {specifier}, 306 .specifiers = {specifier},
@@ -319,10 +316,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) {
319 316
320 ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", 317 ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",
321 toString(radioRsp_v1_2->rspInfo.error).c_str()); 318 toString(radioRsp_v1_2->rspInfo.error).c_str());
322 if (cardStatus.cardState == CardState::ABSENT) { 319 if (cardStatus.base.cardState == CardState::ABSENT) {
323 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 320 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
324 {RadioError::NONE, RadioError::SIM_ABSENT})); 321 {RadioError::NONE, RadioError::SIM_ABSENT}));
325 } else if (cardStatus.cardState == CardState::PRESENT) { 322 } else if (cardStatus.base.cardState == CardState::PRESENT) {
326 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); 323 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));
327 } 324 }
328} 325}
@@ -338,7 +335,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) {
338 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, 335 .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
339 .channels = {1,2}}; 336 .channels = {1,2}};
340 337
341 V1_2::NetworkScanRequest request = { 338 ::android::hardware::radio::V1_2::NetworkScanRequest request = {
342 .type = ScanType::ONE_SHOT, 339 .type = ScanType::ONE_SHOT,
343 .interval = 60, 340 .interval = 60,
344 .specifiers = {specifier}, 341 .specifiers = {specifier},
@@ -355,10 +352,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) {
355 352
356 ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", 353 ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",
357 toString(radioRsp_v1_2->rspInfo.error).c_str()); 354 toString(radioRsp_v1_2->rspInfo.error).c_str());
358 if (cardStatus.cardState == CardState::ABSENT) { 355 if (cardStatus.base.cardState == CardState::ABSENT) {
359 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, 356 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,
360 {RadioError::NONE, RadioError::SIM_ABSENT})); 357 {RadioError::NONE, RadioError::SIM_ABSENT}));
361 } else if (cardStatus.cardState == CardState::PRESENT) { 358 } else if (cardStatus.base.cardState == CardState::PRESENT) {
362 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); 359 ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));
363 } 360 }
364} 361}
@@ -369,8 +366,8 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) {
369TEST_F(RadioHidlTest_v1_2, setIndicationFilter_1_2) { 366TEST_F(RadioHidlTest_v1_2, setIndicationFilter_1_2) {
370 const int serial = GetRandomSerialNumber(); 367 const int serial = GetRandomSerialNumber();
371 368
372 Return<void> res = 369 Return<void> res = radio_v1_2->setIndicationFilter_1_2(
373 radio_v1_2->setIndicationFilter_1_2(serial, static_cast<int>(IndicationFilter::ALL)); 370 serial, static_cast<int>(::android::hardware::radio::V1_2::IndicationFilter::ALL));
374 ASSERT_OK(res); 371 ASSERT_OK(res);
375 EXPECT_EQ(std::cv_status::no_timeout, wait()); 372 EXPECT_EQ(std::cv_status::no_timeout, wait());
376 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 373 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -390,7 +387,7 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_invalidHysteresisD
390 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria( 387 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(
391 serial, 5000, 388 serial, 5000,
392 10, // hysteresisDb too large given threshold list deltas 389 10, // hysteresisDb too large given threshold list deltas
393 {-109, -103, -97, -89}, V1_2::AccessNetwork::GERAN); 390 {-109, -103, -97, -89}, ::android::hardware::radio::V1_2::AccessNetwork::GERAN);
394 ASSERT_OK(res); 391 ASSERT_OK(res);
395 EXPECT_EQ(std::cv_status::no_timeout, wait()); 392 EXPECT_EQ(std::cv_status::no_timeout, wait());
396 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 393 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -407,8 +404,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_invalidHysteresisD
407TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_EmptyParams) { 404TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_EmptyParams) {
408 const int serial = GetRandomSerialNumber(); 405 const int serial = GetRandomSerialNumber();
409 406
410 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(serial, 0, 0, {}, 407 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(
411 V1_2::AccessNetwork::GERAN); 408 serial, 0, 0, {}, ::android::hardware::radio::V1_2::AccessNetwork::GERAN);
412 ASSERT_OK(res); 409 ASSERT_OK(res);
413 EXPECT_EQ(std::cv_status::no_timeout, wait()); 410 EXPECT_EQ(std::cv_status::no_timeout, wait());
414 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 411 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -426,7 +423,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Geran) {
426 const int serial = GetRandomSerialNumber(); 423 const int serial = GetRandomSerialNumber();
427 424
428 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria( 425 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(
429 serial, 5000, 2, {-109, -103, -97, -89}, V1_2::AccessNetwork::GERAN); 426 serial, 5000, 2, {-109, -103, -97, -89},
427 ::android::hardware::radio::V1_2::AccessNetwork::GERAN);
430 ASSERT_OK(res); 428 ASSERT_OK(res);
431 EXPECT_EQ(std::cv_status::no_timeout, wait()); 429 EXPECT_EQ(std::cv_status::no_timeout, wait());
432 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 430 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -444,7 +442,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Utran) {
444 const int serial = GetRandomSerialNumber(); 442 const int serial = GetRandomSerialNumber();
445 443
446 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria( 444 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(
447 serial, 5000, 2, {-110, -97, -73, -49, -25}, V1_2::AccessNetwork::UTRAN); 445 serial, 5000, 2, {-110, -97, -73, -49, -25},
446 ::android::hardware::radio::V1_2::AccessNetwork::UTRAN);
448 ASSERT_OK(res); 447 ASSERT_OK(res);
449 EXPECT_EQ(std::cv_status::no_timeout, wait()); 448 EXPECT_EQ(std::cv_status::no_timeout, wait());
450 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 449 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -462,7 +461,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Eutran) {
462 const int serial = GetRandomSerialNumber(); 461 const int serial = GetRandomSerialNumber();
463 462
464 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria( 463 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(
465 serial, 5000, 2, {-140, -128, -118, -108, -98, -44}, V1_2::AccessNetwork::EUTRAN); 464 serial, 5000, 2, {-140, -128, -118, -108, -98, -44},
465 ::android::hardware::radio::V1_2::AccessNetwork::EUTRAN);
466 ASSERT_OK(res); 466 ASSERT_OK(res);
467 EXPECT_EQ(std::cv_status::no_timeout, wait()); 467 EXPECT_EQ(std::cv_status::no_timeout, wait());
468 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 468 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -480,7 +480,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Cdma2000) {
480 const int serial = GetRandomSerialNumber(); 480 const int serial = GetRandomSerialNumber();
481 481
482 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria( 482 Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(
483 serial, 5000, 2, {-105, -90, -75, -65}, V1_2::AccessNetwork::CDMA2000); 483 serial, 5000, 2, {-105, -90, -75, -65},
484 ::android::hardware::radio::V1_2::AccessNetwork::CDMA2000);
484 ASSERT_OK(res); 485 ASSERT_OK(res);
485 EXPECT_EQ(std::cv_status::no_timeout, wait()); 486 EXPECT_EQ(std::cv_status::no_timeout, wait());
486 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 487 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -500,7 +501,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisDlK
500 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria( 501 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(
501 serial, 5000, 502 serial, 5000,
502 5000, // hysteresisDlKbps too big for thresholds delta 503 5000, // hysteresisDlKbps too big for thresholds delta
503 100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, V1_2::AccessNetwork::GERAN); 504 100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000},
505 ::android::hardware::radio::V1_2::AccessNetwork::GERAN);
504 ASSERT_OK(res); 506 ASSERT_OK(res);
505 EXPECT_EQ(std::cv_status::no_timeout, wait()); 507 EXPECT_EQ(std::cv_status::no_timeout, wait());
506 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 508 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -520,7 +522,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisUlK
520 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria( 522 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(
521 serial, 5000, 500, 523 serial, 5000, 500,
522 1000, // hysteresisUlKbps too big for thresholds delta 524 1000, // hysteresisUlKbps too big for thresholds delta
523 {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, V1_2::AccessNetwork::GERAN); 525 {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000},
526 ::android::hardware::radio::V1_2::AccessNetwork::GERAN);
524 ASSERT_OK(res); 527 ASSERT_OK(res);
525 EXPECT_EQ(std::cv_status::no_timeout, wait()); 528 EXPECT_EQ(std::cv_status::no_timeout, wait());
526 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 529 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -537,8 +540,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisUlK
537TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_emptyParams) { 540TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_emptyParams) {
538 const int serial = GetRandomSerialNumber(); 541 const int serial = GetRandomSerialNumber();
539 542
540 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(serial, 0, 0, 0, {}, {}, 543 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(
541 V1_2::AccessNetwork::GERAN); 544 serial, 0, 0, 0, {}, {}, ::android::hardware::radio::V1_2::AccessNetwork::GERAN);
542 ASSERT_OK(res); 545 ASSERT_OK(res);
543 EXPECT_EQ(std::cv_status::no_timeout, wait()); 546 EXPECT_EQ(std::cv_status::no_timeout, wait());
544 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 547 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -557,7 +560,7 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_Geran) {
557 560
558 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria( 561 Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(
559 serial, 5000, 500, 100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, 562 serial, 5000, 500, 100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000},
560 V1_2::AccessNetwork::GERAN); 563 ::android::hardware::radio::V1_2::AccessNetwork::GERAN);
561 ASSERT_OK(res); 564 ASSERT_OK(res);
562 EXPECT_EQ(std::cv_status::no_timeout, wait()); 565 EXPECT_EQ(std::cv_status::no_timeout, wait());
563 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 566 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -574,7 +577,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_Geran) {
574TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) { 577TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) {
575 const int serial = GetRandomSerialNumber(); 578 const int serial = GetRandomSerialNumber();
576 579
577 V1_2::AccessNetwork accessNetwork = V1_2::AccessNetwork::EUTRAN; 580 ::android::hardware::radio::V1_2::AccessNetwork accessNetwork =
581 ::android::hardware::radio::V1_2::AccessNetwork::EUTRAN;
578 582
579 DataProfileInfo dataProfileInfo; 583 DataProfileInfo dataProfileInfo;
580 memset(&dataProfileInfo, 0, sizeof(dataProfileInfo)); 584 memset(&dataProfileInfo, 0, sizeof(dataProfileInfo));
@@ -600,7 +604,8 @@ TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) {
600 bool roamingAllowed = false; 604 bool roamingAllowed = false;
601 bool isRoaming = false; 605 bool isRoaming = false;
602 606
603 V1_2::DataRequestReason reason = V1_2::DataRequestReason::NORMAL; 607 ::android::hardware::radio::V1_2::DataRequestReason reason =
608 ::android::hardware::radio::V1_2::DataRequestReason::NORMAL;
604 std::vector<hidl_string> addresses = {""}; 609 std::vector<hidl_string> addresses = {""};
605 std::vector<hidl_string> dnses = {""}; 610 std::vector<hidl_string> dnses = {""};
606 611
@@ -613,12 +618,12 @@ TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) {
613 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 618 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
614 EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial); 619 EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial);
615 620
616 if (cardStatus.cardState == CardState::ABSENT) { 621 if (cardStatus.base.cardState == CardState::ABSENT) {
617 ASSERT_TRUE(CheckAnyOfErrors( 622 ASSERT_TRUE(CheckAnyOfErrors(
618 radioRsp_v1_2->rspInfo.error, 623 radioRsp_v1_2->rspInfo.error,
619 {RadioError::SIM_ABSENT, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS, 624 {RadioError::SIM_ABSENT, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,
620 RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW, RadioError::REQUEST_NOT_SUPPORTED})); 625 RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW, RadioError::REQUEST_NOT_SUPPORTED}));
621 } else if (cardStatus.cardState == CardState::PRESENT) { 626 } else if (cardStatus.base.cardState == CardState::PRESENT) {
622 ASSERT_TRUE(CheckAnyOfErrors( 627 ASSERT_TRUE(CheckAnyOfErrors(
623 radioRsp_v1_2->rspInfo.error, 628 radioRsp_v1_2->rspInfo.error,
624 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS, 629 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,
@@ -632,7 +637,8 @@ TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) {
632TEST_F(RadioHidlTest_v1_2, deactivateDataCall_1_2) { 637TEST_F(RadioHidlTest_v1_2, deactivateDataCall_1_2) {
633 const int serial = GetRandomSerialNumber(); 638 const int serial = GetRandomSerialNumber();
634 int cid = 1; 639 int cid = 1;
635 V1_2::DataRequestReason reason = V1_2::DataRequestReason::NORMAL; 640 ::android::hardware::radio::V1_2::DataRequestReason reason =
641 ::android::hardware::radio::V1_2::DataRequestReason::NORMAL;
636 642
637 Return<void> res = radio_v1_2->deactivateDataCall_1_2(serial, cid, reason); 643 Return<void> res = radio_v1_2->deactivateDataCall_1_2(serial, cid, reason);
638 ASSERT_OK(res); 644 ASSERT_OK(res);
@@ -641,13 +647,13 @@ TEST_F(RadioHidlTest_v1_2, deactivateDataCall_1_2) {
641 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); 647 EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
642 EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial); 648 EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial);
643 649
644 if (cardStatus.cardState == CardState::ABSENT) { 650 if (cardStatus.base.cardState == CardState::ABSENT) {
645 ASSERT_TRUE(CheckAnyOfErrors( 651 ASSERT_TRUE(CheckAnyOfErrors(
646 radioRsp_v1_2->rspInfo.error, 652 radioRsp_v1_2->rspInfo.error,
647 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_CALL_ID, 653 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_CALL_ID,
648 RadioError::INVALID_STATE, RadioError::INVALID_ARGUMENTS, 654 RadioError::INVALID_STATE, RadioError::INVALID_ARGUMENTS,
649 RadioError::REQUEST_NOT_SUPPORTED, RadioError::CANCELLED, RadioError::SIM_ABSENT})); 655 RadioError::REQUEST_NOT_SUPPORTED, RadioError::CANCELLED, RadioError::SIM_ABSENT}));
650 } else if (cardStatus.cardState == CardState::PRESENT) { 656 } else if (cardStatus.base.cardState == CardState::PRESENT) {
651 ASSERT_TRUE(CheckAnyOfErrors( 657 ASSERT_TRUE(CheckAnyOfErrors(
652 radioRsp_v1_2->rspInfo.error, 658 radioRsp_v1_2->rspInfo.error,
653 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_CALL_ID, 659 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_CALL_ID,
diff --git a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
index 4f05effd..2c8b6996 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
+++ b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
@@ -17,8 +17,19 @@
17#include <radio_hidl_hal_utils_v1_2.h> 17#include <radio_hidl_hal_utils_v1_2.h>
18 18
19void RadioHidlTest_v1_2::SetUp() { 19void RadioHidlTest_v1_2::SetUp() {
20 radio_v1_2 = ::testing::VtsHalHidlTargetTestBase::getService<V1_2::IRadio>( 20 radio_v1_2 =
21 hidl_string(RADIO_SERVICE_NAME)); 21 ::testing::VtsHalHidlTargetTestBase::getService<::android::hardware::radio::V1_2::IRadio>(
22 RadioHidlEnvironment::Instance()
23 ->getServiceName<::android::hardware::radio::V1_2::IRadio>(
24 hidl_string(RADIO_SERVICE_NAME)));
25 if (radio_v1_2 == NULL) {
26 sleep(60);
27 radio_v1_2 = ::testing::VtsHalHidlTargetTestBase::getService<
28 ::android::hardware::radio::V1_2::IRadio>(
29 RadioHidlEnvironment::Instance()
30 ->getServiceName<::android::hardware::radio::V1_2::IRadio>(
31 hidl_string(RADIO_SERVICE_NAME)));
32 }
22 ASSERT_NE(nullptr, radio_v1_2.get()); 33 ASSERT_NE(nullptr, radio_v1_2.get());
23 34
24 radioRsp_v1_2 = new (std::nothrow) RadioResponse_v1_2(*this); 35 radioRsp_v1_2 = new (std::nothrow) RadioResponse_v1_2(*this);
diff --git a/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h b/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h
index 342fdb0c..09158ae0 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h
+++ b/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h
@@ -21,14 +21,14 @@
21#include <condition_variable> 21#include <condition_variable>
22#include <mutex> 22#include <mutex>
23 23
24#include <android/hardware/radio/1.1/IRadioIndication.h>
25#include <android/hardware/radio/1.1/IRadioResponse.h>
26#include <android/hardware/radio/1.2/IRadio.h> 24#include <android/hardware/radio/1.2/IRadio.h>
25#include <android/hardware/radio/1.2/IRadioIndication.h>
26#include <android/hardware/radio/1.2/IRadioResponse.h>
27#include <android/hardware/radio/1.2/types.h> 27#include <android/hardware/radio/1.2/types.h>
28 28
29#include "vts_test_util.h" 29#include "vts_test_util.h"
30 30
31using namespace ::android::hardware::radio; 31using namespace ::android::hardware::radio::V1_2;
32using namespace ::android::hardware::radio::V1_1; 32using namespace ::android::hardware::radio::V1_1;
33using namespace ::android::hardware::radio::V1_0; 33using namespace ::android::hardware::radio::V1_0;
34 34
@@ -43,10 +43,10 @@ using ::android::sp;
43#define RADIO_SERVICE_NAME "slot1" 43#define RADIO_SERVICE_NAME "slot1"
44 44
45class RadioHidlTest_v1_2; 45class RadioHidlTest_v1_2;
46extern CardStatus cardStatus; 46extern ::android::hardware::radio::V1_2::CardStatus cardStatus;
47 47
48/* Callback class for radio response v1_2*/ 48/* Callback class for radio response v1_2*/
49class RadioResponse_v1_2 : public V1_1::IRadioResponse { 49class RadioResponse_v1_2 : public ::android::hardware::radio::V1_2::IRadioResponse {
50 protected: 50 protected:
51 RadioHidlTest_v1_2& parent_v1_2; 51 RadioHidlTest_v1_2& parent_v1_2;
52 52
@@ -58,8 +58,9 @@ class RadioResponse_v1_2 : public V1_1::IRadioResponse {
58 RadioResponse_v1_2(RadioHidlTest_v1_2& parent_v1_2); 58 RadioResponse_v1_2(RadioHidlTest_v1_2& parent_v1_2);
59 virtual ~RadioResponse_v1_2() = default; 59 virtual ~RadioResponse_v1_2() = default;
60 60
61 Return<void> getIccCardStatusResponse(const RadioResponseInfo& info, 61 Return<void> getIccCardStatusResponse(
62 const CardStatus& cardStatus); 62 const RadioResponseInfo& info,
63 const ::android::hardware::radio::V1_0::CardStatus& cardStatus);
63 64
64 Return<void> supplyIccPinForAppResponse(const RadioResponseInfo& info, 65 Return<void> supplyIccPinForAppResponse(const RadioResponseInfo& info,
65 int32_t remainingRetries); 66 int32_t remainingRetries);
@@ -82,8 +83,9 @@ class RadioResponse_v1_2 : public V1_1::IRadioResponse {
82 Return<void> supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info, 83 Return<void> supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info,
83 int32_t remainingRetries); 84 int32_t remainingRetries);
84 85
85 Return<void> getCurrentCallsResponse(const RadioResponseInfo& info, 86 Return<void> getCurrentCallsResponse(
86 const ::android::hardware::hidl_vec<Call>& calls); 87 const RadioResponseInfo& info,
88 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& calls);
87 89
88 Return<void> dialResponse(const RadioResponseInfo& info); 90 Return<void> dialResponse(const RadioResponseInfo& info);
89 91
@@ -105,14 +107,17 @@ class RadioResponse_v1_2 : public V1_1::IRadioResponse {
105 Return<void> getLastCallFailCauseResponse(const RadioResponseInfo& info, 107 Return<void> getLastCallFailCauseResponse(const RadioResponseInfo& info,
106 const LastCallFailCauseInfo& failCauseInfo); 108 const LastCallFailCauseInfo& failCauseInfo);
107 109
108 Return<void> getSignalStrengthResponse(const RadioResponseInfo& info, 110 Return<void> getSignalStrengthResponse(
109 const SignalStrength& sigStrength); 111 const RadioResponseInfo& info,
112 const ::android::hardware::radio::V1_0::SignalStrength& sigStrength);
110 113
111 Return<void> getVoiceRegistrationStateResponse(const RadioResponseInfo& info, 114 Return<void> getVoiceRegistrationStateResponse(
112 const VoiceRegStateResult& voiceRegResponse); 115 const RadioResponseInfo& info,
116 const ::android::hardware::radio::V1_0::VoiceRegStateResult& voiceRegResponse);
113 117
114 Return<void> getDataRegistrationStateResponse(const RadioResponseInfo& info, 118 Return<void> getDataRegistrationStateResponse(
115 const DataRegStateResult& dataRegResponse); 119 const RadioResponseInfo& info,
120 const ::android::hardware::radio::V1_0::DataRegStateResult& dataRegResponse);
116 121
117 Return<void> getOperatorResponse(const RadioResponseInfo& info, 122 Return<void> getOperatorResponse(const RadioResponseInfo& info,
118 const ::android::hardware::hidl_string& longName, 123 const ::android::hardware::hidl_string& longName,
@@ -311,8 +316,9 @@ class RadioResponse_v1_2 : public V1_1::IRadioResponse {
311 Return<void> getVoiceRadioTechnologyResponse(const RadioResponseInfo& info, 316 Return<void> getVoiceRadioTechnologyResponse(const RadioResponseInfo& info,
312 RadioTechnology rat); 317 RadioTechnology rat);
313 318
314 Return<void> getCellInfoListResponse(const RadioResponseInfo& info, 319 Return<void> getCellInfoListResponse(
315 const ::android::hardware::hidl_vec<CellInfo>& cellInfo); 320 const RadioResponseInfo& info,
321 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>& cellInfo);
316 322
317 Return<void> setCellInfoListRateResponse(const RadioResponseInfo& info); 323 Return<void> setCellInfoListRateResponse(const RadioResponseInfo& info);
318 324
@@ -407,27 +413,33 @@ class RadioResponse_v1_2 : public V1_1::IRadioResponse {
407 413
408 Return<void> setLinkCapacityReportingCriteriaResponse(const RadioResponseInfo& info); 414 Return<void> setLinkCapacityReportingCriteriaResponse(const RadioResponseInfo& info);
409 415
410 Return<void> getIccCardStatusResponse_1_2(const RadioResponseInfo& info, 416 Return<void> getIccCardStatusResponse_1_2(
411 const CardStatus& card_status); 417 const RadioResponseInfo& info,
418 const ::android::hardware::radio::V1_2::CardStatus& card_status);
412 419
413 Return<void> getCurrentCallsResponse_1_2(const RadioResponseInfo& info, 420 Return<void> getCurrentCallsResponse_1_2(
414 const ::android::hardware::hidl_vec<Call>& calls); 421 const RadioResponseInfo& info,
422 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& calls);
415 423
416 Return<void> getSignalStrengthResponse_1_2(const RadioResponseInfo& info, 424 Return<void> getSignalStrengthResponse_1_2(
417 const SignalStrength& sig_strength); 425 const RadioResponseInfo& info,
426 const ::android::hardware::radio::V1_2::SignalStrength& sig_strength);
418 427
419 Return<void> getCellInfoListResponse_1_2( 428 Return<void> getCellInfoListResponse_1_2(
420 const RadioResponseInfo& info, const ::android::hardware::hidl_vec<CellInfo>& cellInfo); 429 const RadioResponseInfo& info,
430 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>& cellInfo);
421 431
422 Return<void> getVoiceRegistrationStateResponse_1_2( 432 Return<void> getVoiceRegistrationStateResponse_1_2(
423 const RadioResponseInfo& info, const V1_2::VoiceRegStateResult& voiceRegResponse); 433 const RadioResponseInfo& info,
434 const ::android::hardware::radio::V1_2::VoiceRegStateResult& voiceRegResponse);
424 435
425 Return<void> getDataRegistrationStateResponse_1_2( 436 Return<void> getDataRegistrationStateResponse_1_2(
426 const RadioResponseInfo& info, const V1_2::DataRegStateResult& dataRegResponse); 437 const RadioResponseInfo& info,
438 const ::android::hardware::radio::V1_2::DataRegStateResult& dataRegResponse);
427}; 439};
428 440
429/* Callback class for radio indication */ 441/* Callback class for radio indication */
430class RadioIndication_v1_2 : public V1_1::IRadioIndication { 442class RadioIndication_v1_2 : public ::android::hardware::radio::V1_2::IRadioIndication {
431 protected: 443 protected:
432 RadioHidlTest_v1_2& parent_v1_2; 444 RadioHidlTest_v1_2& parent_v1_2;
433 445
@@ -436,26 +448,33 @@ class RadioIndication_v1_2 : public V1_1::IRadioIndication {
436 virtual ~RadioIndication_v1_2() = default; 448 virtual ~RadioIndication_v1_2() = default;
437 449
438 /* 1.2 Api */ 450 /* 1.2 Api */
439 Return<void> networkScanResult_1_2(RadioIndicationType type, 451 Return<void> networkScanResult_1_2(
440 const V1_2::NetworkScanResult& result); 452 RadioIndicationType type,
453 const ::android::hardware::radio::V1_2::NetworkScanResult& result);
441 454
442 Return<void> cellInfoList_1_2(RadioIndicationType type, 455 Return<void> cellInfoList_1_2(
443 const ::android::hardware::hidl_vec<V1_2::CellInfo>& records); 456 RadioIndicationType type,
457 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>& records);
444 458
445 Return<void> currentLinkCapacityEstimate(RadioIndicationType type, 459 Return<void> currentLinkCapacityEstimate(
446 const V1_2::LinkCapacityEstimate& lce); 460 RadioIndicationType type,
461 const ::android::hardware::radio::V1_2::LinkCapacityEstimate& lce);
447 462
448 Return<void> currentPhysicalChannelConfigs( 463 Return<void> currentPhysicalChannelConfigs(
449 RadioIndicationType type, 464 RadioIndicationType type,
450 const ::android::hardware::hidl_vec<V1_2::PhysicalChannelConfig>& configs); 465 const ::android::hardware::hidl_vec<
466 ::android::hardware::radio::V1_2::PhysicalChannelConfig>& configs);
451 467
452 Return<void> currentSignalStrength_1_2(RadioIndicationType type, 468 Return<void> currentSignalStrength_1_2(
453 const V1_2::SignalStrength& signalStrength); 469 RadioIndicationType type,
470 const ::android::hardware::radio::V1_2::SignalStrength& signalStrength);
454 471
455 /* 1.1 Api */ 472 /* 1.1 Api */
456 Return<void> carrierInfoForImsiEncryption(RadioIndicationType info); 473 Return<void> carrierInfoForImsiEncryption(RadioIndicationType info);
457 474
458 Return<void> networkScanResult(RadioIndicationType type, const NetworkScanResult& result); 475 Return<void> networkScanResult(
476 RadioIndicationType type,
477 const ::android::hardware::radio::V1_1::NetworkScanResult& result);
459 478
460 Return<void> keepaliveStatus(RadioIndicationType type, const KeepaliveStatus& status); 479 Return<void> keepaliveStatus(RadioIndicationType type, const KeepaliveStatus& status);
461 480
@@ -481,8 +500,9 @@ class RadioIndication_v1_2 : public V1_1::IRadioIndication {
481 const ::android::hardware::hidl_string& nitzTime, 500 const ::android::hardware::hidl_string& nitzTime,
482 uint64_t receivedTime); 501 uint64_t receivedTime);
483 502
484 Return<void> currentSignalStrength(RadioIndicationType type, 503 Return<void> currentSignalStrength(
485 const SignalStrength& signalStrength); 504 RadioIndicationType type,
505 const ::android::hardware::radio::V1_0::SignalStrength& signalStrength);
486 506
487 Return<void> dataCallListChanged( 507 Return<void> dataCallListChanged(
488 RadioIndicationType type, const ::android::hardware::hidl_vec<SetupDataCallResult>& dcList); 508 RadioIndicationType type, const ::android::hardware::hidl_vec<SetupDataCallResult>& dcList);
@@ -540,8 +560,9 @@ class RadioIndication_v1_2 : public V1_1::IRadioIndication {
540 560
541 Return<void> voiceRadioTechChanged(RadioIndicationType type, RadioTechnology rat); 561 Return<void> voiceRadioTechChanged(RadioIndicationType type, RadioTechnology rat);
542 562
543 Return<void> cellInfoList(RadioIndicationType type, 563 Return<void> cellInfoList(
544 const ::android::hardware::hidl_vec<CellInfo>& records); 564 RadioIndicationType type,
565 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>& records);
545 566
546 Return<void> imsNetworkStateChanged(RadioIndicationType type); 567 Return<void> imsNetworkStateChanged(RadioIndicationType type);
547 568
@@ -568,6 +589,22 @@ class RadioIndication_v1_2 : public V1_1::IRadioIndication {
568 const ::android::hardware::hidl_string& reason); 589 const ::android::hardware::hidl_string& reason);
569}; 590};
570 591
592// Test environment for Radio HIDL HAL.
593class RadioHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
594 public:
595 // get the test environment singleton
596 static RadioHidlEnvironment* Instance() {
597 static RadioHidlEnvironment* instance = new RadioHidlEnvironment;
598 return instance;
599 }
600 virtual void registerTestServices() override {
601 registerTestService<::android::hardware::radio::V1_2::IRadio>();
602 }
603
604 private:
605 RadioHidlEnvironment() {}
606};
607
571// The main test class for Radio HIDL. 608// The main test class for Radio HIDL.
572class RadioHidlTest_v1_2 : public ::testing::VtsHalHidlTargetTestBase { 609class RadioHidlTest_v1_2 : public ::testing::VtsHalHidlTargetTestBase {
573 protected: 610 protected:
@@ -585,7 +622,7 @@ class RadioHidlTest_v1_2 : public ::testing::VtsHalHidlTargetTestBase {
585 std::cv_status wait(); 622 std::cv_status wait();
586 623
587 /* radio service handle */ 624 /* radio service handle */
588 sp<V1_2::IRadio> radio_v1_2; 625 sp<::android::hardware::radio::V1_2::IRadio> radio_v1_2;
589 626
590 /* radio response handle */ 627 /* radio response handle */
591 sp<RadioResponse_v1_2> radioRsp_v1_2; 628 sp<RadioResponse_v1_2> radioRsp_v1_2;
diff --git a/radio/1.2/vts/functional/radio_indication.cpp b/radio/1.2/vts/functional/radio_indication.cpp
index 57f5cb06..eba9dc07 100644
--- a/radio/1.2/vts/functional/radio_indication.cpp
+++ b/radio/1.2/vts/functional/radio_indication.cpp
@@ -20,29 +20,33 @@ RadioIndication_v1_2::RadioIndication_v1_2(RadioHidlTest_v1_2& parent) : parent_
20 20
21/* 1.2 Apis */ 21/* 1.2 Apis */
22Return<void> RadioIndication_v1_2::networkScanResult_1_2( 22Return<void> RadioIndication_v1_2::networkScanResult_1_2(
23 RadioIndicationType /*type*/, const V1_2::NetworkScanResult& /*result*/) { 23 RadioIndicationType /*type*/,
24 const ::android::hardware::radio::V1_2::NetworkScanResult& /*result*/) {
24 return Void(); 25 return Void();
25} 26}
26 27
27Return<void> RadioIndication_v1_2::cellInfoList_1_2( 28Return<void> RadioIndication_v1_2::cellInfoList_1_2(
28 RadioIndicationType /*type*/, 29 RadioIndicationType /*type*/,
29 const ::android::hardware::hidl_vec<V1_2::CellInfo>& /*records*/) { 30 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>& /*records*/) {
30 return Void(); 31 return Void();
31} 32}
32 33
33Return<void> RadioIndication_v1_2::currentLinkCapacityEstimate( 34Return<void> RadioIndication_v1_2::currentLinkCapacityEstimate(
34 RadioIndicationType /*type*/, const V1_2::LinkCapacityEstimate& /*lce*/) { 35 RadioIndicationType /*type*/,
36 const ::android::hardware::radio::V1_2::LinkCapacityEstimate& /*lce*/) {
35 return Void(); 37 return Void();
36} 38}
37 39
38Return<void> RadioIndication_v1_2::currentPhysicalChannelConfigs( 40Return<void> RadioIndication_v1_2::currentPhysicalChannelConfigs(
39 RadioIndicationType /*type*/, 41 RadioIndicationType /*type*/,
40 const ::android::hardware::hidl_vec<V1_2::PhysicalChannelConfig>& /*configs*/) { 42 const ::android::hardware::hidl_vec<
43 ::android::hardware::radio::V1_2::PhysicalChannelConfig>& /*configs*/) {
41 return Void(); 44 return Void();
42} 45}
43 46
44Return<void> RadioIndication_v1_2::currentSignalStrength_1_2( 47Return<void> RadioIndication_v1_2::currentSignalStrength_1_2(
45 RadioIndicationType /*type*/, const V1_2::SignalStrength& /*signalStrength*/) { 48 RadioIndicationType /*type*/,
49 const ::android::hardware::radio::V1_2::SignalStrength& /*signalStrength*/) {
46 return Void(); 50 return Void();
47} 51}
48 52
@@ -51,8 +55,9 @@ Return<void> RadioIndication_v1_2::carrierInfoForImsiEncryption(RadioIndicationT
51 return Void(); 55 return Void();
52} 56}
53 57
54Return<void> RadioIndication_v1_2::networkScanResult(RadioIndicationType /*type*/, 58Return<void> RadioIndication_v1_2::networkScanResult(
55 const NetworkScanResult& /*result*/) { 59 RadioIndicationType /*type*/,
60 const ::android::hardware::radio::V1_1::NetworkScanResult& /*result*/) {
56 return Void(); 61 return Void();
57} 62}
58 63
@@ -101,8 +106,9 @@ Return<void> RadioIndication_v1_2::nitzTimeReceived(
101 return Void(); 106 return Void();
102} 107}
103 108
104Return<void> RadioIndication_v1_2::currentSignalStrength(RadioIndicationType /*type*/, 109Return<void> RadioIndication_v1_2::currentSignalStrength(
105 const SignalStrength& /*signalStrength*/) { 110 RadioIndicationType /*type*/,
111 const ::android::hardware::radio::V1_0::SignalStrength& /*signalStrength*/) {
106 return Void(); 112 return Void();
107} 113}
108 114
@@ -224,7 +230,8 @@ Return<void> RadioIndication_v1_2::voiceRadioTechChanged(RadioIndicationType /*t
224} 230}
225 231
226Return<void> RadioIndication_v1_2::cellInfoList( 232Return<void> RadioIndication_v1_2::cellInfoList(
227 RadioIndicationType /*type*/, const ::android::hardware::hidl_vec<CellInfo>& /*records*/) { 233 RadioIndicationType /*type*/,
234 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>& /*records*/) {
228 return Void(); 235 return Void();
229} 236}
230 237
@@ -276,4 +283,4 @@ Return<void> RadioIndication_v1_2::pcoData(RadioIndicationType /*type*/,
276Return<void> RadioIndication_v1_2::modemReset(RadioIndicationType /*type*/, 283Return<void> RadioIndication_v1_2::modemReset(RadioIndicationType /*type*/,
277 const ::android::hardware::hidl_string& /*reason*/) { 284 const ::android::hardware::hidl_string& /*reason*/) {
278 return Void(); 285 return Void();
279} 286} \ No newline at end of file
diff --git a/radio/1.2/vts/functional/radio_response.cpp b/radio/1.2/vts/functional/radio_response.cpp
index e7176abc..85ec3e06 100644
--- a/radio/1.2/vts/functional/radio_response.cpp
+++ b/radio/1.2/vts/functional/radio_response.cpp
@@ -16,13 +16,14 @@
16 16
17#include <radio_hidl_hal_utils_v1_2.h> 17#include <radio_hidl_hal_utils_v1_2.h>
18 18
19CardStatus cardStatus; 19::android::hardware::radio::V1_2::CardStatus cardStatus;
20 20
21RadioResponse_v1_2::RadioResponse_v1_2(RadioHidlTest_v1_2& parent) : parent_v1_2(parent) {} 21RadioResponse_v1_2::RadioResponse_v1_2(RadioHidlTest_v1_2& parent) : parent_v1_2(parent) {}
22 22
23/* 1.0 Apis */ 23/* 1.0 Apis */
24Return<void> RadioResponse_v1_2::getIccCardStatusResponse(const RadioResponseInfo& /*info*/, 24Return<void> RadioResponse_v1_2::getIccCardStatusResponse(
25 const CardStatus& /*card_status*/) { 25 const RadioResponseInfo& /*info*/,
26 const ::android::hardware::radio::V1_0::CardStatus& /*card_status*/) {
26 return Void(); 27 return Void();
27} 28}
28 29
@@ -62,7 +63,8 @@ Return<void> RadioResponse_v1_2::supplyNetworkDepersonalizationResponse(
62} 63}
63 64
64Return<void> RadioResponse_v1_2::getCurrentCallsResponse( 65Return<void> RadioResponse_v1_2::getCurrentCallsResponse(
65 const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<Call>& /*calls*/) { 66 const RadioResponseInfo& /*info*/,
67 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& /*calls*/) {
66 return Void(); 68 return Void();
67} 69}
68 70
@@ -107,18 +109,21 @@ Return<void> RadioResponse_v1_2::getLastCallFailCauseResponse(
107 return Void(); 109 return Void();
108} 110}
109 111
110Return<void> RadioResponse_v1_2::getSignalStrengthResponse(const RadioResponseInfo& /*info*/, 112Return<void> RadioResponse_v1_2::getSignalStrengthResponse(
111 const SignalStrength& /*sig_strength*/) { 113 const RadioResponseInfo& /*info*/,
114 const ::android::hardware::radio::V1_0::SignalStrength& /*sig_strength*/) {
112 return Void(); 115 return Void();
113} 116}
114 117
115Return<void> RadioResponse_v1_2::getVoiceRegistrationStateResponse( 118Return<void> RadioResponse_v1_2::getVoiceRegistrationStateResponse(
116 const RadioResponseInfo& /*info*/, const VoiceRegStateResult& /*voiceRegResponse*/) { 119 const RadioResponseInfo& /*info*/,
120 const ::android::hardware::radio::V1_0::VoiceRegStateResult& /*voiceRegResponse*/) {
117 return Void(); 121 return Void();
118} 122}
119 123
120Return<void> RadioResponse_v1_2::getDataRegistrationStateResponse( 124Return<void> RadioResponse_v1_2::getDataRegistrationStateResponse(
121 const RadioResponseInfo& /*info*/, const DataRegStateResult& /*dataRegResponse*/) { 125 const RadioResponseInfo& /*info*/,
126 const ::android::hardware::radio::V1_0::DataRegStateResult& /*dataRegResponse*/) {
122 return Void(); 127 return Void();
123} 128}
124 129
@@ -517,7 +522,7 @@ Return<void> RadioResponse_v1_2::getVoiceRadioTechnologyResponse(const RadioResp
517 522
518Return<void> RadioResponse_v1_2::getCellInfoListResponse( 523Return<void> RadioResponse_v1_2::getCellInfoListResponse(
519 const RadioResponseInfo& /*info*/, 524 const RadioResponseInfo& /*info*/,
520 const ::android::hardware::hidl_vec<CellInfo>& /*cellInfo*/) { 525 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>& /*cellInfo*/) {
521 return Void(); 526 return Void();
522} 527}
523 528
@@ -706,8 +711,9 @@ Return<void> RadioResponse_v1_2::setLinkCapacityReportingCriteriaResponse(
706 return Void(); 711 return Void();
707} 712}
708 713
709Return<void> RadioResponse_v1_2::getIccCardStatusResponse_1_2(const RadioResponseInfo& info, 714Return<void> RadioResponse_v1_2::getIccCardStatusResponse_1_2(
710 const CardStatus& card_status) { 715 const RadioResponseInfo& info,
716 const ::android::hardware::radio::V1_2::CardStatus& card_status) {
711 rspInfo = info; 717 rspInfo = info;
712 cardStatus = card_status; 718 cardStatus = card_status;
713 parent_v1_2.notify(); 719 parent_v1_2.notify();
@@ -715,32 +721,37 @@ Return<void> RadioResponse_v1_2::getIccCardStatusResponse_1_2(const RadioRespons
715} 721}
716 722
717Return<void> RadioResponse_v1_2::getCurrentCallsResponse_1_2( 723Return<void> RadioResponse_v1_2::getCurrentCallsResponse_1_2(
718 const RadioResponseInfo& info, const ::android::hardware::hidl_vec<Call>& /*calls*/) { 724 const RadioResponseInfo& info,
725 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& /*calls*/) {
719 rspInfo = info; 726 rspInfo = info;
720 parent_v1_2.notify(); 727 parent_v1_2.notify();
721 return Void(); 728 return Void();
722} 729}
723 730
724Return<void> RadioResponse_v1_2::getSignalStrengthResponse_1_2( 731Return<void> RadioResponse_v1_2::getSignalStrengthResponse_1_2(
725 const RadioResponseInfo& info, const SignalStrength& /*sig_strength*/) { 732 const RadioResponseInfo& info,
733 const ::android::hardware::radio::V1_2::SignalStrength& /*sig_strength*/) {
726 rspInfo = info; 734 rspInfo = info;
727 parent_v1_2.notify(); 735 parent_v1_2.notify();
728 return Void(); 736 return Void();
729} 737}
730 738
731Return<void> RadioResponse_v1_2::getCellInfoListResponse_1_2( 739Return<void> RadioResponse_v1_2::getCellInfoListResponse_1_2(
732 const RadioResponseInfo& info, const ::android::hardware::hidl_vec<CellInfo>& /*cellInfo*/) { 740 const RadioResponseInfo& info,
741 const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>& /*cellInfo*/) {
733 rspInfo = info; 742 rspInfo = info;
734 parent_v1_2.notify(); 743 parent_v1_2.notify();
735 return Void(); 744 return Void();
736} 745}
737 746
738Return<void> RadioResponse_v1_2::getVoiceRegistrationStateResponse_1_2( 747Return<void> RadioResponse_v1_2::getVoiceRegistrationStateResponse_1_2(
739 const RadioResponseInfo& /*info*/, const V1_2::VoiceRegStateResult& /*voiceRegResponse*/) { 748 const RadioResponseInfo& /*info*/,
749 const ::android::hardware::radio::V1_2::VoiceRegStateResult& /*voiceRegResponse*/) {
740 return Void(); 750 return Void();
741} 751}
742 752
743Return<void> RadioResponse_v1_2::getDataRegistrationStateResponse_1_2( 753Return<void> RadioResponse_v1_2::getDataRegistrationStateResponse_1_2(
744 const RadioResponseInfo& /*info*/, const V1_2::DataRegStateResult& /*dataRegResponse*/) { 754 const RadioResponseInfo& /*info*/,
755 const ::android::hardware::radio::V1_2::DataRegStateResult& /*dataRegResponse*/) {
745 return Void(); 756 return Void();
746} 757} \ No newline at end of file