Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 02:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed.

Browse Source 
For those devices which does not support GSM, returning is not
supported or invalid arguments are the expected behavior.

Bug: 271642958
Test: atest VtsHalRadioTargetTest
Merged-In: I3ac7407fdee82348411db99d340613e62f36a277
Change-Id: I3ac7407fdee82348411db99d340613e62f36a277
Signed-off-by: Jia Jia <jia.jia@zte.com.cn>
(cherry picked from commit 5bf6d5777a)
This commit is contained in:
Zhang Yuan
2023-03-04 17:05:09 +08:00
committed by Jack Yu
parent f7bd18c7c6
commit 399c257ece
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
radio/1.5/vts/functional/radio_hidl_hal_api.cpp
View File

@@ -595,12 +595,17 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan) {
if (cardStatus.base.base.base.cardState == CardState::ABSENT) { if (cardStatus.base.base.base.cardState == CardState::ABSENT) {
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT})); ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT}));
} else if (cardStatus.base.base.base.cardState == CardState::PRESENT) { } else if (cardStatus.base.base.base.cardState == CardState::PRESENT) {
// OPERATION_NOT_ALLOWED should not be allowed; however, some vendors do // Modems have "GSM" rat scan need to
// not support the required manual GSM search functionality. This is
// tracked in b/112206766. Modems have "GSM" rat scan need to
// support scanning requests combined with some parameters. // support scanning requests combined with some parameters.
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED})); ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));
} else {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_5->rspInfo.error,
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED,
RadioError::REQUEST_NOT_SUPPORTED, RadioError::INVALID_ARGUMENTS}));
}
} }
if (radioRsp_v1_5->rspInfo.error == RadioError::NONE) { if (radioRsp_v1_5->rspInfo.error == RadioError::NONE) {

11
radio/aidl/vts/radio_network_test.cpp
View File

@@ -862,8 +862,15 @@ TEST_P(RadioNetworkTest, startNetworkScan) {
// not support the required manual GSM search functionality. This is // not support the required manual GSM search functionality. This is
// tracked in b/112206766. Modems have "GSM" rat scan need to // tracked in b/112206766. Modems have "GSM" rat scan need to
// support scanning requests combined with some parameters. // support scanning requests combined with some parameters.
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED})); ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));
} else {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_network->rspInfo.error,
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED, RadioError::NONE,
RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED}));
}
} }
if (radioRsp_network->rspInfo.error == RadioError::NONE) { if (radioRsp_network->rspInfo.error == RadioError::NONE) {