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: Id7ff1f589915f3dadd1dd6b66876a0a4daa90a68
This commit is contained in:
Chiachang Wang
2021-10-01 01:09:56 +00:00
committed by Automerger Merge Worker

View File

@@ -582,6 +582,9 @@ public final class CtsNetUtils {
}
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;
}