tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I590f8330170aed00293129e29d247ae46427a240
This commit is contained in:
Treehugger Robot 2020-12-04 21:42:42 +00:00 committed by Automerger Merge Worker
commit ad9cfea07a
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
radio/1.6/IRadio.hal
View file

@ -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.

9
radio/1.6/vts/functional/radio_hidl_hal_api.cpp
View file

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