Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44

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

Change-Id: I1d76c931f944a62f59f71b4e26ab4257ee1c5b29
This commit is contained in:
Aaron Tsai 2021-05-14 03:24:24 +00:00 committed by Automerger Merge Worker
commit 90f0c0e3be

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));
}
}