Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" am: 3c8f624724

am: aad649b8df

Change-Id: I44287c0d85a4c15804092321d2dd5f532757f2b9
This commit is contained in:
Nathan Harold
2019-10-09 19:44:45 -07:00
committed by android-build-merger
2 changed files with 10 additions and 2 deletions

View File

@@ -46,7 +46,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) {
::android::hardware::radio::V1_2::NetworkScanRequest request = { ::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT, .type = ScanType::ONE_SHOT,
.interval = 60, .interval = 60,
.specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}}; .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 60,
.incrementalResults = false,
.incrementalResultsPeriodicity = 1};
Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request); Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request);
ASSERT_OK(res); ASSERT_OK(res);

View File

@@ -183,7 +183,12 @@ TEST_F(RadioHidlTest_v1_4, startNetworkScan) {
.channels = {1, 2}}; .channels = {1, 2}};
::android::hardware::radio::V1_2::NetworkScanRequest request = { ::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT, .interval = 60, .specifiers = {specifier}}; .type = ScanType::ONE_SHOT,
.interval = 60,
.specifiers = {specifier},
.maxSearchTime = 60,
.incrementalResults = false,
.incrementalResultsPeriodicity = 1};
Return<void> res = radio_v1_4->startNetworkScan_1_4(serial, request); Return<void> res = radio_v1_4->startNetworkScan_1_4(serial, request);
ASSERT_OK(res); ASSERT_OK(res);