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

Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed." am: 86bc150058 am: bc00ee0af0 am: 52e70ec981

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

Change-Id: Ic31fd5f850ab50847e896f30952bc6de45db1edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu 2023-03-14 21:25:05 +00:00 committed by Automerger Merge Worker
commit a80f6f7c96
2 changed files with 19 additions and 7 deletions
Show stats 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) {
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT}));
} else if (cardStatus.base.base.base.cardState == CardState::PRESENT) {
// OPERATION_NOT_ALLOWED should not be allowed; however, some vendors do
// not support the required manual GSM search functionality. This is
// tracked in b/112206766. Modems have "GSM" rat scan need to
// Modems have "GSM" rat scan need to
// support scanning requests combined with some parameters.
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));
if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {
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) {

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

@ -889,8 +889,15 @@ TEST_P(RadioNetworkTest, startNetworkScan) {
// 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.
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));
if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {
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) {