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

Merge "Improve handling of invalid private DNS settings" am: b80e88d604 am: 67bb33e5cc

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

Change-Id: I735561c48510ff5d4771888d815d7a336f4ccea7
This commit is contained in:
Treehugger Robot
2021-06-09 11:30:08 +00:00
committed by Automerger Merge Worker
parent e4fa2ac5ac 67bb33e5cc
commit 4c22076ae4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -529,12 +529,14 @@ public final class CtsNetUtils {
}
// restore private DNS setting
if (PRIVATE_DNS_MODE_STRICT.equals(mOldPrivateDnsMode)) {
setPrivateDnsStrictMode(mOldPrivateDnsSpecifier);
// In case of invalid setting, still restore it but fail the test
// In case of invalid setting, set to opportunistic to avoid a bad state and fail
if (mOldPrivateDnsSpecifier == null) {
Settings.Global.putString(mCR, Settings.Global.PRIVATE_DNS_MODE,
PRIVATE_DNS_MODE_OPPORTUNISTIC);
fail("Invalid private DNS setting: no hostname specified in strict mode");
}
setPrivateDnsStrictMode(mOldPrivateDnsSpecifier);
awaitPrivateDnsSetting("restorePrivateDnsSetting timeout",
mCm.getActiveNetwork(),
mOldPrivateDnsSpecifier, true);