commit 8fb0fc8eb0723608f98bc602dfe7a4c09f1ebc7c
author Chiachang Wang <chiachangwang@google.com> Fri Oct 01 01:10:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 01 01:10:03 2021 +0000
tree c5cff0abea1fc3776874e7a1b9142285d7244e7b
parent df9f58215ff2376823db52cc5a6e33963f644c34
parent d2bd93f2e29ee9b75b7be2226011d4a935891186

Merge "Restore private dns host name after testing" am: 0ee7406d33 am: d2bd93f2e2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114

Change-Id: Ifb4064c3ad66e36d1fc8dac34710b83f48cada77

tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java

diff --git a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
index fd0cd18..7d9a24b 100644
--- a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
+++ b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
@@ -582,6 +582,9 @@
         }
 
         if (mOldPrivateDnsMode != ConnectivitySettingsUtils.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME) {
+            // Also restore hostname even if the value is not used since private dns is not in
+            // the strict mode to prevent setting being changed after test.
+            ConnectivitySettingsUtils.setPrivateDnsHostname(mContext, mOldPrivateDnsSpecifier);
             ConnectivitySettingsUtils.setPrivateDnsMode(mContext, mOldPrivateDnsMode);
             return;
         }