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

Commit 5810759f authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

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

Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" am: 3c8f6247 am: aad649b8 am: 797aee83
am: 3c239867

Change-Id: If3cc4dae2aa6a67d84976ac2b6bdaa7fba8f0326
parents 96e03496 3c239867

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { 
    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

            .type = ScanType::ONE_SHOT,

            .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);

    ASSERT_OK(res);

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

+6 −1
Original line number Diff line number Diff line
@@ -183,7 +183,12 @@ TEST_F(RadioHidlTest_v1_4, startNetworkScan) { 
                                      .channels = {1, 2}};



    ::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);

    ASSERT_OK(res);