commit 91c0bcba04661af4f0041939f4f0a1a86dff9a11
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 27 05:18:31 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 27 05:18:31 2022 +0000
tree 10c1f022879753df4a54d65f34ccc9a30efe8e0d
parent 79b38b491c6b4302e64a5160325a54302a6b4850
parent 217f55f8b9162b19c4d55793cd3430ff416dbd7e

Merge "Disable data stall recovery for DnsResolverTest"

tests/cts/net/src/android/net/cts/DnsResolverTest.java

diff --git a/tests/cts/net/src/android/net/cts/DnsResolverTest.java b/tests/cts/net/src/android/net/cts/DnsResolverTest.java
index c6fc38f..0c53411 100644
--- a/tests/cts/net/src/android/net/cts/DnsResolverTest.java
+++ b/tests/cts/net/src/android/net/cts/DnsResolverTest.java
@@ -49,6 +49,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.platform.test.annotations.AppModeFull;
+import android.provider.Settings;
 import android.system.ErrnoException;
 import android.util.Log;
 
@@ -727,6 +728,18 @@
 
     @Test
     public void testPrivateDnsBypass() throws InterruptedException {
+        final String dataStallSetting = Settings.Global.getString(mCR,
+                Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK);
+        Settings.Global.putInt(mCR, Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK, 0);
+        try {
+            doTestPrivateDnsBypass();
+        } finally {
+            Settings.Global.putString(mCR, Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK,
+                    dataStallSetting);
+        }
+    }
+
+    private void doTestPrivateDnsBypass() throws InterruptedException {
         final Network[] testNetworks = getTestableNetworks();
 
         // Set an invalid private DNS server