Snap for 7521021 from 1af183d66e3733393c6738704047247bd3c2f9a1 to mainline-media-releaseandroid-mainline-12.0.0_r89android-mainline-12.0.0_r74android-mainline-12.0.0_r62android-mainline-12.0.0_r46android-mainline-12.0.0_r29android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r104android12-mainline-media-release

Change-Id: Id0458814c07689f9db6212ef667d982ee87dec7e

2 files changed, 4 insertions, 4 deletions

diff --git a/net/test/resilient_rs_test.py b/net/test/resilient_rs_test.py
index 27b9f49..be3210b 100755
--- a/net/test/resilient_rs_test.py
+++ b/net/test/resilient_rs_test.py
@@ -97,14 +97,14 @@ class ResilientRouterSolicitationTest(multinetwork_base.MultiNetworkBaseTest):
 
   def testRouterSolicitationBackoff(self):
     # Test error tolerance
-    EPSILON = 0.1
+    EPSILON = 0.15
     # Minimum RFC3315 S14 backoff
     MIN_EXP = 1.9 - EPSILON
     # Maximum RFC3315 S14 backoff
     MAX_EXP = 2.1 + EPSILON
     SOLICITATION_INTERVAL = 1
-    # Linear backoff for 4 samples yields 3.6 < T < 4.4
-    # Exponential backoff for 4 samples yields 4.83 < T < 9.65
+    # Linear backoff for 4 samples yields 3.5 < T < 4.5
+    # Exponential backoff for 4 samples yields 4.36 < T < 10.39
     REQUIRED_SAMPLES = 4
     # Give up after 10 seconds. Tuned for REQUIRED_SAMPLES = 4
     SAMPLE_INTERVAL = 10
diff --git a/net/test/sysctls_test.py b/net/test/sysctls_test.py
index 4b71f39..cb608f6 100755
--- a/net/test/sysctls_test.py
+++ b/net/test/sysctls_test.py
@@ -23,7 +23,7 @@ class SysctlsTest(net_test.NetworkTest):
 
   def check(self, f):
     algs = open(f).readline().strip().split(' ')
-    bad_algs = [a for a in algs if a not in ['bbr', 'bbr2', 'cubic', 'reno']]
+    bad_algs = [a for a in algs if a not in ['cubic', 'reno']]
     msg = ("Obsolete TCP congestion control algorithm found. These "
            "algorithms will decrease real-world networking performance for "
            "users and must be disabled. Found: %s" % bad_algs)