Merge "VTS: Check for "ro.board.first_api_level" in GetBarringInfo()"

This commit is contained in:
Nathan Harold
2022-01-14 18:22:49 +00:00
committed by Gerrit Code Review

View File

@@ -1271,8 +1271,12 @@ TEST_P(RadioHidlTest_v1_5, getBarringInfo) {
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial); EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
int32_t firstApiLevel = android::base::GetIntProperty<int32_t>("ro.product.first_api_level", 0); int32_t firstApiLevel = android::base::GetIntProperty<int32_t>("ro.product.first_api_level", 0);
int32_t boardApiLevel = android::base::GetIntProperty<int32_t>("ro.board.first_api_level", 0);
// Allow devices shipping with Radio::1_5 and Android 11 to not support barring info. // Allow devices shipping with Radio::1_5 and Android 11 to not support barring info.
if (firstApiLevel > 0 && firstApiLevel <= 30) { // b/212384410 Some GRF targets lauched with S release but with vendor R release
// do not support getBarringInfo API. Allow these devices to not support barring info.
if ((firstApiLevel > 0 && firstApiLevel <= 30) ||
(boardApiLevel > 0 && boardApiLevel <= 30)) {
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,
{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
// Early exit for devices that don't support barring info. // Early exit for devices that don't support barring info.