Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e678690e authored by Nathan Harold's avatar Nathan Harold
Browse files

Revert "Use Widely Supported GSM Channels for NetworkScan" 

This reverts commit 92bb3ae7.

There is an issue with the bands used for P900... the chosen
bands were for PCS1900. Quick fix coming.
parent 6f337cc8

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+99 −65
Original line number Original line Diff line number Diff line
@@ -19,25 +19,19 @@ 




#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,

        .type = ScanType::ONE_SHOT, .interval = 60, .specifiers = {specifier}};

            .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);
@@ -95,10 +89,15 @@ 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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        .maxSearchTime = 60,

        .maxSearchTime = 60,

        .incrementalResults = false,

        .incrementalResults = false,

        .incrementalResultsPeriodicity = 1};

        .incrementalResultsPeriodicity = 1};
@@ -127,10 +126,15 @@ 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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        .maxSearchTime = 60,

        .maxSearchTime = 60,

        .incrementalResults = false,

        .incrementalResults = false,

        .incrementalResultsPeriodicity = 1};

        .incrementalResultsPeriodicity = 1};
@@ -159,10 +163,15 @@ 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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        .maxSearchTime = 59,

        .maxSearchTime = 59,

        .incrementalResults = false,

        .incrementalResults = false,

        .incrementalResultsPeriodicity = 1};

        .incrementalResultsPeriodicity = 1};
@@ -191,10 +200,15 @@ 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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        .maxSearchTime = 3601,

        .maxSearchTime = 3601,

        .incrementalResults = false,

        .incrementalResults = false,

        .incrementalResultsPeriodicity = 1};

        .incrementalResultsPeriodicity = 1};
@@ -223,10 +237,15 @@ 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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        .maxSearchTime = 600,

        .maxSearchTime = 600,

        .incrementalResults = false,

        .incrementalResults = false,

        .incrementalResultsPeriodicity = 0};

        .incrementalResultsPeriodicity = 0};
@@ -255,10 +274,15 @@ 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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        .maxSearchTime = 600,

        .maxSearchTime = 600,

        .incrementalResults = false,

        .incrementalResults = false,

        .incrementalResultsPeriodicity = 11};

        .incrementalResultsPeriodicity = 11};
@@ -287,10 +311,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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        // 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,
@@ -321,10 +350,15 @@ 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 = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

        .specifiers = {specifier},

        // 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,