Merge tag 'android-security-11.0.0_r49' into int/11/fp3
Android security 11.0.0 release 49
* tag 'android-security-11.0.0_r49':
Fix OOB read in DNS resolver
Change-Id: I86e11731b4264dc798c893a05da4a1f0bc77648f
diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp
index 95b5a5c..1e65007 100644
--- a/tests/resolv_integration_test.cpp
+++ b/tests/resolv_integration_test.cpp
@@ -4121,6 +4121,9 @@
// The resolver will adjust the timeout value to 1000ms since the value is too small.
ScopedSystemProperties scopedSystemProperties(kDotConnectTimeoutMsFlag, "100");
+ // Re-setup test network to make experiment flag take effect.
+ resetNetwork();
+
// Set up resolver to opportunistic mode with the default configuration.
const ResolverParamsParcel parcel = DnsResponderClient::GetDefaultResolverParamsParcel();
ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));