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

Merge "Remove HAL API of whether enabling uicc applications are enabled."

Browse source
This commit is contained in:
Xiangyu/Malcolm Chen 2019-12-11 23:00:41 +00:00 committed by Gerrit Code Review
commit e5c19d9bb3
4 changed files with 6 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
current.txt
View file

@ -605,9 +605,9 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar
c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
eaf870a7439838c66127a74e1896c4a2346979c116eb1931785ebb4d353230ae android.hardware.radio@1.5::types
584001c25a16e3a29d496cff28dee690833cd2bda5376febe01cecd476ce876f android.hardware.radio@1.5::IRadio
ae2fd16a80caff9cb6e3f91875c7f68f7ff76c75334056549d38496673eafe5b android.hardware.radio@1.5::IRadio
3afac66f21a33bc9c4b80481c7d5540038348651d9a7d8af64ea13610af138da android.hardware.radio@1.5::IRadioIndication
caf00e0d942b77b17d7061b38de11e5b19e1da90d4818434cb4916ba89e30686 android.hardware.radio@1.5::IRadioResponse
e7268d32bedcf7d98324ffc808ec3dc45248d47ff4d04519d09e3c71767a7ad1 android.hardware.radio@1.5::IRadioResponse
55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types
b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig
742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication

15
radio/1.5/IRadio.hal
View file

@ -72,8 +72,8 @@ interface IRadio extends @1.4::IRadio {
* The preference is per SIM, and must be remembered over power cycle, modem reboot, or SIM
* insertion / unplug.
*
* @param serial: Serial number of request.
* @param enable: true if to enable uiccApplications, false to disable.
* @param serial Serial number of request.
* @param enable true if to enable uiccApplications, false to disable.
* Response callback is IRadioResponse.enableUiccApplicationsResponse()
*/
@ -91,17 +91,6 @@ interface IRadio extends @1.4::IRadio {
*/
oneway areUiccApplicationsEnabled(int32_t serial);
/**
* Query whether disabling and enabling UiccApplications functionality is supported. If not,
* calling enableUiccApplications with a different value will return
* RadioError:REQUEST_NOT_SUPPORTED.
*
* @param serial Serial number of request.
*
* Response callback is IRadioResponse.canToggleUiccApplicationsEnablementResponse()
*/
oneway canToggleUiccApplicationsEnablement(int32_t serial);
/**
* Specify which bands modem's background scan must act on.
* If specifyChannels is true, it only scans bands specified in specifiers.

13
radio/1.5/IRadioResponse.hal
View file

@ -42,7 +42,6 @@ interface IRadioResponse extends @1.4::IRadioResponse {
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INTERNAL_ERR
* RadioError:BUSY
* RadioError:REQUEST_NOT_SUPPORTED
*/
oneway enableUiccApplicationsResponse(RadioResponseInfo info);
@ -55,21 +54,9 @@ interface IRadioResponse extends @1.4::IRadioResponse {
* RadioError:SIM_ABSENT
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INTERNAL_ERR
* RadioError:REQUEST_NOT_SUPPORTED
*/
oneway areUiccApplicationsEnabledResponse(RadioResponseInfo info, bool enabled);
/**
* @param info Response info struct containing response type, serial no. and error
* @param canToggle whether toggling UiccApplications functionality is supported.
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INTERNAL_ERR
*/
oneway canToggleUiccApplicationsEnablementResponse(RadioResponseInfo info, bool canToggle);
/**
* @param info Response info struct containing response type, serial no. and error
*

80
radio/1.5/vts/functional/radio_hidl_hal_api.cpp
View file

@ -309,64 +309,11 @@ TEST_F(RadioHidlTest_v1_5, setSignalStrengthReportingCriteria_1_5_NGRAN_SSSINR)
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::NONE}));
}
/*
* Test IRadio.enableUiccApplications() for the response returned.
*/
TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsNotSupported) {
serial = GetRandomSerialNumber();
radio_v1_5->canToggleUiccApplicationsEnablement(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
// No error should happen.
EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
// Supported case will be tested by other test cases.
if (radioRsp_v1_5->canToggleUiccApplicationsEnablement) return;
// Enabling UiccApplications should still work as it should be enabled by default.
serial = GetRandomSerialNumber();
radio_v1_5->enableUiccApplications(serial, true);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
// Disabling UiccApplications should return REQUEST_NOT_SUPPORTED error.
serial = GetRandomSerialNumber();
radio_v1_5->enableUiccApplications(serial, false);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
EXPECT_EQ(RadioError::REQUEST_NOT_SUPPORTED, radioRsp_v1_5->rspInfo.error);
// Query areUiccApplicationsEnabled should return true.
serial = GetRandomSerialNumber();
radio_v1_5->areUiccApplicationsEnabled(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
ASSERT_TRUE(radioRsp_v1_5->areUiccApplicationsEnabled);
}
/*
* Test IRadio.enableUiccApplications() for the response returned.
* For SIM ABSENT case.
*/
TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSupportedSimAbsent) {
serial = GetRandomSerialNumber();
radio_v1_5->canToggleUiccApplicationsEnablement(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
// No error should happen.
EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
// Not supported case will be tested by togglingUiccApplicationsNotSupported test case.
if (!radioRsp_v1_5->canToggleUiccApplicationsEnablement) return;
TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSimAbsent) {
// This test case only test SIM ABSENT case.
if (cardStatus.base.base.cardState != CardState::ABSENT) return;
@ -393,18 +340,7 @@ TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSupportedSimAbsent) {
* Test IRadio.enableUiccApplications() for the response returned.
* For SIM PRESENT case.
*/
TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSupportedSimPresent) {
serial = GetRandomSerialNumber();
radio_v1_5->canToggleUiccApplicationsEnablement(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
// No error should happen.
EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
// Not supported case will be tested by disablingUiccApplicationsNotSupported test case.
if (!radioRsp_v1_5->canToggleUiccApplicationsEnablement) return;
TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSimPresent) {
// This test case only test SIM ABSENT case.
if (cardStatus.base.base.cardState != CardState::PRESENT) return;
@ -451,18 +387,6 @@ TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSupportedSimPresent) {
* Test IRadio.areUiccApplicationsEnabled() for the response returned.
*/
TEST_F(RadioHidlTest_v1_5, areUiccApplicationsEnabled) {
serial = GetRandomSerialNumber();
radio_v1_5->canToggleUiccApplicationsEnablement(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
// No error should happen.
EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
// Not supported case will be tested by togglingUiccApplicationsNotSupported test case.
if (!radioRsp_v1_5->canToggleUiccApplicationsEnablement) return;
// Disable Uicc applications.
serial = GetRandomSerialNumber();
radio_v1_5->areUiccApplicationsEnabled(serial);