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

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

Merge changes I94874f53,I90133555 into qt-dev 

am: 1d957da3

Change-Id: I9714b761908e5ef72fa6791e4b55436cf33d3f89
parents 7fdb7dd7 1d957da3

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ eb754b58c93e5591613208b4c972811288b0fa16a82430d602f107c91a908b22 android.hardwar 
ed9da80ec0c96991fd03f0a46107815d0e50f764656e49dba4980fa5c31d5bc3 android.hardware.radio@1.0::types

1d19720d4fd38b1095f0f555a4bd92b3b12c9b1d0f560b0e9a474cd6dcc20db6 android.hardware.radio@1.2::IRadio

cd1757867a5e3a3faa362e785239515870d1a3c9ce756c6f0cf0f0fd8aac2547 android.hardware.radio@1.2::types

722b3595548ed7f1953b6e0143dc842d4d6e290ff009a134eb518d7c17a09347 android.hardware.radio@1.2::types # b/112486807

e78cf871f9fd1c072874e481e06e18e2681763cf2aa38c1fd777d53bab4eb69b android.hardware.sensors@1.0::types

3d01e29e8129186f7567c4f9c8bee7480a0768e587b1be9b28adb0a6cbec6bf2 android.hardware.tv.cec@1.0::types

1722ad002317b1fae1400de709e90f442d94ef22864e05f7a12af48c32e8edc8 android.hardware.usb@1.1::types

radio/1.2/types.hal

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ struct NetworkScanRequest { 
     * the client (in seconds).

     * Expected range for the input is

     * [IncrementalResultsPeriodicityRange:MIN - IncrementalResultsPeriodicityRange:MAX]

     * This value must be less than or equal to maxSearchTime.

     * This value must be less than or equal to maxSearchTime. If incremental results are

     * not requested, implementations may ignore this value.

     */

    int32_t incrementalResultsPeriodicity;

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { 
            .interval = 60,

            .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

            .maxSearchTime = 600,

            .incrementalResults = false,

            .incrementalResults = true,

            .incrementalResultsPeriodicity = 0};



    Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request);
@@ -260,7 +260,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { 
            .interval = 60,

            .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

            .maxSearchTime = 600,

            .incrementalResults = false,

            .incrementalResults = true,

            .incrementalResultsPeriodicity = 11};



    Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request);