Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use Widely Supported GSM Channels for NetworkScan"

Browse Source
This commit is contained in:
Nathan Harold
2019-05-10 18:08:12 +00:00
committed by Gerrit Code Review
parent 0e0721f56e 92bb3ae7b9
commit 6f337cc82b
1 changed files with 65 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
radio/1.2/vts/functional/radio_hidl_hal_api.cpp
View File

@@ -19,19 +19,25 @@
#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk()) #define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
namespace {
const RadioAccessSpecifier GERAN_SPECIFIER_P900 = {.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_P900},
.channels = {512, 513}};
const RadioAccessSpecifier GERAN_SPECIFIER_850 = {.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_850},
.channels = {128, 129}};
} // namespace
/* /*
* Test IRadio.startNetworkScan() for the response returned. * Test IRadio.startNetworkScan() for the response returned.
*/ */
TEST_F(RadioHidlTest_v1_2, startNetworkScan) { TEST_F(RadioHidlTest_v1_2, startNetworkScan) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}};
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);
@@ -89,18 +95,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::android::hardware::radio::V1_2::NetworkScanRequest request = { ::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT, .type = ScanType::ONE_SHOT,
.interval = 4, .interval = 4,
.specifiers = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 60, .maxSearchTime = 60,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 1}; .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);
@@ -126,18 +127,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::android::hardware::radio::V1_2::NetworkScanRequest request = { ::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT, .type = ScanType::ONE_SHOT,
.interval = 301, .interval = 301,
.specifiers = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 60, .maxSearchTime = 60,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 1}; .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);
@@ -163,18 +159,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::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 = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 59, .maxSearchTime = 59,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 1}; .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);
@@ -200,18 +191,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::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 = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 3601, .maxSearchTime = 3601,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 1}; .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);
@@ -237,18 +223,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::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 = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 600, .maxSearchTime = 600,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 0}; .incrementalResultsPeriodicity = 0};
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);
@@ -274,18 +255,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::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 = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 600, .maxSearchTime = 600,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 11}; .incrementalResultsPeriodicity = 11};
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);
@@ -311,20 +287,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::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 = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
// Some vendor may not support max search time of 360s. // Some vendor may not support max search time of 360s.
// This issue is tracked in b/112205669. // This issue is tracked in b/112205669.
.maxSearchTime = 300, .maxSearchTime = 300,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 10}; .incrementalResultsPeriodicity = 10};
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);
@@ -350,21 +321,16 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) {
TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) {
serial = GetRandomSerialNumber(); serial = GetRandomSerialNumber();
RadioAccessSpecifier specifier = {
.radioAccessNetwork = RadioAccessNetworks::GERAN,
.geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},
.channels = {1,2}};
::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 = {specifier}, .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
// Some vendor may not support max search time of 360s. // Some vendor may not support max search time of 360s.
// This issue is tracked in b/112205669. // This issue is tracked in b/112205669.
.maxSearchTime = 300, .maxSearchTime = 300,
.incrementalResults = false, .incrementalResults = false,
.incrementalResultsPeriodicity = 10, .incrementalResultsPeriodicity = 10,
.mccMncs = {"310410"}}; .mccMncs = {"310410"}};
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);