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

Merge "Allow Unsupported BarringInfo in RVC for Radio 1.5" into rvc-dev

Browse Source
This commit is contained in:
Nathan Harold
2020-06-25 17:52:46 +00:00
committed by Android (Google) Code Review
parent 494c937d78 25d2378734
commit facdb89fbd
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <android-base/properties.h>
#include <radio_hidl_hal_utils_v1_5.h> #include <radio_hidl_hal_utils_v1_5.h>
#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk()) #define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
@@ -1174,6 +1175,17 @@ TEST_P(RadioHidlTest_v1_5, getBarringInfo) {
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
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);
// Allow devices shipping with Radio::1_5 and Android 11 to not support barring info.
if (firstApiLevel > 0 && firstApiLevel <= 30) {
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,
{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
// Early exit for devices that don't support barring info.
if (radioRsp_v1_5->rspInfo.error != RadioError::NONE) {
return;
}
}
ASSERT_TRUE(radioRsp_v1_5->barringInfos.size() > 0); ASSERT_TRUE(radioRsp_v1_5->barringInfos.size() > 0);
std::set<BarringInfo::ServiceType> reportedServices; std::set<BarringInfo::ServiceType> reportedServices;