Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6"

This commit is contained in:
Aaron Tsai
2021-05-14 03:02:50 +00:00
committed by Gerrit Code Review

View File

@@ -45,10 +45,8 @@ TEST_P(RadioHidlTest_v1_6, getAvailableNetworks) {
::android::hardware::radio::V1_0::RadioError::NONE) {
static const std::regex kOperatorNumericRe("^[0-9]{5,6}$");
for (OperatorInfo info : radioRsp_v1_6->networkInfos) {
if (info.operatorNumeric != nullptr) {
ASSERT_TRUE(
std::regex_match(std::string(info.operatorNumeric), kOperatorNumericRe));
}
ASSERT_TRUE(
std::regex_match(std::string(info.operatorNumeric), kOperatorNumericRe));
}
}