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

Commit ad9cfea0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change setDataThrottling window parameter to a long millisecond." am: c8bf0854

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510231

Change-Id: I590f8330170aed00293129e29d247ae46427a240
parents cce79769 c8bf0854
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -347,15 +347,15 @@ interface IRadio extends @1.5::IRadio {
     *
     * @param serial Serial number of request.
     * @param dataThrottlingAction DataThrottlingAction as defined in types.hal
     * @param completionWindowSecs window, in seconds, in which the requested
     *     throttling action has to be achieved. This must be 0 when
     * @param completionDurationMillis window, in milliseconds, in which the
     *     requested throttling action has to be achieved. This must be 0 when
     *     dataThrottlingAction is DataThrottlingAction:HOLD.
     *
     * Response function is IRadioResponse.setDataThrottlingResponse()
     */
    oneway setDataThrottling(int32_t serial,
            DataThrottlingAction dataThrottlingAction,
            int32_t completionWindowSecs);
            int64_t completionDurationMillis);

    /**
     * Get which bands the modem's background scan is acting on.
+5 −4
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
    serial = GetRandomSerialNumber();

    Return<void> res = radio_v1_6->setDataThrottling(
            serial, DataThrottlingAction::THROTTLE_SECONDARY_CARRIER, 60);
            serial, DataThrottlingAction::THROTTLE_SECONDARY_CARRIER, 60000);
    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());
@@ -318,7 +318,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {

    serial = GetRandomSerialNumber();

    res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::THROTTLE_ANCHOR_CARRIER, 60);
    res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::THROTTLE_ANCHOR_CARRIER,
                                        60000);
    ASSERT_OK(res);
    EXPECT_EQ(std::cv_status::no_timeout, wait());
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
@@ -332,7 +333,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {

    serial = GetRandomSerialNumber();

    res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::HOLD, 60);
    res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::HOLD, 60000);
    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());
@@ -347,7 +348,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {

    serial = GetRandomSerialNumber();

    res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::NO_DATA_THROTTLING, 60);
    res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::NO_DATA_THROTTLING, 60000);
    ASSERT_OK(res);
    EXPECT_EQ(std::cv_status::no_timeout, wait());
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);