Change setDataThrottling window parameter to a long millisecond.
As requested by Android Council review of API. Test: vts Change-Id: I1f633856c31623ef95f459b2195743f53b5d85fc Merged-In: I1f633856c31623ef95f459b2195743f53b5d85fc
This commit is contained in:
parent
f14d297d7c
commit
3f76554417
2 changed files with 8 additions and 7 deletions
|
@ -347,15 +347,15 @@ interface IRadio extends @1.5::IRadio {
|
||||||
*
|
*
|
||||||
* @param serial Serial number of request.
|
* @param serial Serial number of request.
|
||||||
* @param dataThrottlingAction DataThrottlingAction as defined in types.hal
|
* @param dataThrottlingAction DataThrottlingAction as defined in types.hal
|
||||||
* @param completionWindowSecs window, in seconds, in which the requested
|
* @param completionDurationMillis window, in milliseconds, in which the
|
||||||
* throttling action has to be achieved. This must be 0 when
|
* requested throttling action has to be achieved. This must be 0 when
|
||||||
* dataThrottlingAction is DataThrottlingAction:HOLD.
|
* dataThrottlingAction is DataThrottlingAction:HOLD.
|
||||||
*
|
*
|
||||||
* Response function is IRadioResponse.setDataThrottlingResponse()
|
* Response function is IRadioResponse.setDataThrottlingResponse()
|
||||||
*/
|
*/
|
||||||
oneway setDataThrottling(int32_t serial,
|
oneway setDataThrottling(int32_t serial,
|
||||||
DataThrottlingAction dataThrottlingAction,
|
DataThrottlingAction dataThrottlingAction,
|
||||||
int32_t completionWindowSecs);
|
int64_t completionDurationMillis);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get which bands the modem's background scan is acting on.
|
* Get which bands the modem's background scan is acting on.
|
||||||
|
|
|
@ -303,7 +303,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
|
||||||
serial = GetRandomSerialNumber();
|
serial = GetRandomSerialNumber();
|
||||||
|
|
||||||
Return<void> res = radio_v1_6->setDataThrottling(
|
Return<void> res = radio_v1_6->setDataThrottling(
|
||||||
serial, DataThrottlingAction::THROTTLE_SECONDARY_CARRIER, 60);
|
serial, DataThrottlingAction::THROTTLE_SECONDARY_CARRIER, 60000);
|
||||||
ASSERT_OK(res);
|
ASSERT_OK(res);
|
||||||
|
|
||||||
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
||||||
|
@ -318,7 +318,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
|
||||||
|
|
||||||
serial = GetRandomSerialNumber();
|
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);
|
ASSERT_OK(res);
|
||||||
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
||||||
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
|
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
|
||||||
|
@ -332,7 +333,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
|
||||||
|
|
||||||
serial = GetRandomSerialNumber();
|
serial = GetRandomSerialNumber();
|
||||||
|
|
||||||
res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::HOLD, 60);
|
res = radio_v1_6->setDataThrottling(serial, DataThrottlingAction::HOLD, 60000);
|
||||||
ASSERT_OK(res);
|
ASSERT_OK(res);
|
||||||
|
|
||||||
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
||||||
|
@ -347,7 +348,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
|
||||||
|
|
||||||
serial = GetRandomSerialNumber();
|
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);
|
ASSERT_OK(res);
|
||||||
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
EXPECT_EQ(std::cv_status::no_timeout, wait());
|
||||||
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
|
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
|
||||||
|
|
Loading…
Reference in a new issue