LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: I51344c514278433e66016a812e1458e5e2df0e8d
This commit is contained in:
Chiachang Wang
2021-10-01 00:54:23 +00:00
committed by Automerger Merge Worker
parent e129460c46 0ee7406d33
commit d2bd93f2e2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
View File

@@ -582,6 +582,9 @@ public final class CtsNetUtils {
} }
if (mOldPrivateDnsMode != ConnectivitySettingsUtils.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME) { 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); ConnectivitySettingsUtils.setPrivateDnsMode(mContext, mOldPrivateDnsMode);
return; return;
} }