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

Merge "add capability for TelephonyManager.getNetworkSlicingConfiguration()" into sc-dev

Browse source
This commit is contained in:
Amit Mahajan 2021-03-23 21:10:37 +00:00 committed by Android (Google) Code Review
commit 812a33cb40
5 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
radio/1.6/IRadioResponse.hal
View file

@ -433,6 +433,7 @@ interface IRadioResponse extends @1.5::IRadioResponse {
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INTERNAL_ERR
* RadioError:MODEM_ERR
* RadioError:REQUEST_NOT_SUPPORTED
*/
oneway getSlicingConfigResponse(RadioResponseInfo info,
SlicingConfig slicingConfig);

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

@ -172,7 +172,13 @@ TEST_P(RadioHidlTest_v1_6, getSlicingConfig) {
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
if (getRadioHalCapabilities().modemReducedFeatureSet1) {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
} else {
EXPECT_EQ(::android::hardware::radio::V1_6::RadioError::NONE, radioRsp_v1_6->rspInfo.error);
}
}
/*

3
radio/config/1.3/types.hal
View file

@ -33,6 +33,9 @@ struct HalDeviceCapabilities {
* </li>
* <li>Requesting android.hardware.radio@1.6::IRadio.setDataThrottling()
* </li>
* <li>Providing android.hardware.radio@1.6::SlicingConfig through
* android.hardware.radio@1.6::getSlicingConfig()
* </li>
* </ul>
*/
bool modemReducedFeatureSet1;

4
radio/config/1.3/vts/functional/radio_config_hidl_hal_utils.h
View file

@ -37,7 +37,7 @@
#include "vts_test_util.h"
using namespace ::android::hardware::radio::config::V1_2;
using namespace ::android::hardware::radio::config::V1_3;
using ::android::sp;
using ::android::hardware::hidl_string;
@ -46,9 +46,11 @@ using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::hardware::radio::config::V1_1::ModemsConfig;
using ::android::hardware::radio::config::V1_1::PhoneCapability;
using ::android::hardware::radio::config::V1_2::IRadioConfigIndication;
using ::android::hardware::radio::config::V1_2::SimSlotStatus;
using ::android::hardware::radio::config::V1_3::HalDeviceCapabilities;
using ::android::hardware::radio::config::V1_3::IRadioConfig;
using ::android::hardware::radio::config::V1_3::IRadioConfigResponse;
using ::android::hardware::radio::V1_0::RadioResponseInfo;
#define RADIO_SERVICE_NAME "slot1"

3
radio/config/1.3/vts/functional/radio_config_response.cpp
View file

@ -64,8 +64,9 @@ Return<void> RadioConfigResponse::setModemsConfigResponse(
}
Return<void> RadioConfigResponse::getHalDeviceCapabilitiesResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& /* info */,
const ::android::hardware::radio::V1_6::RadioResponseInfo& info,
const ::android::hardware::radio::config::V1_3::HalDeviceCapabilities& capabilities) {
halDeviceCapabilities = capabilities;
parent.notify(info.serial);
return Void();
}