Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" (058de98e) · Commits · e / os / android_hardware_interfaces

radio/1.6/vts/functional/radio_hidl_hal_misc.cpp

+2 −4

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

	LOG(DEBUG) << "getAvailableNetworks finished";		LOG(DEBUG) << "getAvailableNetworks finished";
	}		}